Fixing up the occasional "Cannot connect to server" issue