fix more path escaping issues