Minor fixes to the form utilities.