connection timeout fixes