fix more namespace stuff