Fixed validations