Fixes to the forms