More fixes for form