Fix form bindings