Performance improvements

19 jobs for perf in 5 minutes and 17 seconds (queued for 15 seconds)
latest