Small fixes to forms.