Cosmetics code fixes