Fix up form fields