Fronted fixes

2 jobs for master in 1 minute and 17 seconds (queued for 7 seconds)