Make the validations work