Fix bug in dynamic form field handling, and typo.