Minor fixes to forms