More namespaces & path fixes