Improve connect timeout handling (hopefully)