Nested form fixes