Fix namespaces and set operations