Fixed issues where queueing with RetrySet was acting unexpectedly.