localization bug fixes