New form fixes