More blueprint/i18n changes