Some form fixes