Fix Validations