fixing i18n issues