Further fixes to MVCForm