Cosmetic fixes