Small changes to reduce load on pools if they fail and come back up