Some more i18n cleanup