fix more path issues