Fix first connect mostly failing because it is apparently that big of an issue for some people.