Some cleanup and locales