i18n changes and validation changes