various fixes to namespaces