generic form fixes