fix more remaining compilation errors.