More fixes for locales