fixes to namespacing