Fix form errors on submit