more i18n improvements