i18n header improvements