Improved job retrying