Fix validations and error messages