Fix validations