A bunch of small fixes to forms