Validation fixes
Validations