Fixes for nested form fixes

That ended up mucking around with some validations