Fix a couple more times
Merge branch 'keep-trying-to-claim-in-stress-test' into travis-random-testing