Some fixes to namespaces...