fixes for localization