Fix form fields