Fixes

There's are 2 patches to address some serious pain points, which are:
 - Re-running jobs that are already running, and;
 - Constantly retrying jobs that always fail.