Fix some of the bindings