Fix connection establishment issues