more namespaces fixes