More fixes to the forms