Fixed some more logic errors

2 jobs for master in 5 minutes and 20 seconds (queued for 1 second)