Tweaked timeout handling