Validations fixed