Updated form fields to proper types.