Should ideally fix more of the shiftclick NPEs