fix more build bugs