fixings in i18n module