fix more backwards compat errors