i18n fixes/consistency