form fixes