minor fixes

4 jobs for master in 8 minutes and 13 seconds (queued for 2 seconds)