Cosmetic fixes after merge nightmare