fix more build issues?