Small cosmetic fixes