Cosmetic fixes from previous merge