Cosmetic fixes only