More warning fixes

23 jobs for warn2 in 63 minutes and 59 seconds (queued for 1 second)