fix more build issues