fixes for better i18n