Fixed i18n issues