fixed i18n issues