Make validations work