Use correct types for form fields