Tweaks to socket timeout