fix more warnings

7 jobs for master in 3 minutes and 39 seconds