form fixes 2 (#1802)