bug fixes with localization issues