Fixes issues with namespaces and such