fix more compiling issues