Attempt to fix some connection issues