Mixed cosmetic fixes