Improvements to RetryWorker