fix more warnings (but not all)