more i18 tweaks