fixes to localization