Fix form errors