More form fixes