namespace and path fixes