More validation improvements and fixed an i18n string