Some improvements to ping timeouts.