Fix bindings

This should resolve the namespace and binding issues that were happening