fixes for localization, etc