Cosmetic fixes

Fix some annoying issues.