Mostly cosmetic fixes