Minor code adjustments

1 job for master in 4 minutes and 2 seconds (queued for 1 minute and 17 seconds)