Namespace and path fixes