Fix form validations