Fix field types