i18n improvements.