Make validation rules consistent