fix more regressions