Fixing namespaces, etc