misc fixes

2 jobs for master in 19 minutes and 52 seconds (queued for 1 second)