Latest i18n changes as per Dave N