Attempt to fix more of pmap.