fix up the form defs