i18n upgrades