fix more build errors