Minor improvements

2 jobs for master in 4 minutes and 49 seconds (queued for 44 seconds)
latest