fix more failures for dispatch