Fix task handling bugs, so peers are more likely to be available#3191