misc fixes

3 jobs for master in 27 minutes and 10 seconds (queued for 1 second)