Fixed remaining bindings