Minor code adjustments

1 job for master in 4 minutes and 4 seconds (queued for 7 seconds)