Cosmetic fixes, no code changes