Merge "Fix two crashes"