Fixed validations on models