Utility and localization fixes