Fix namespaces and unbinding