Fixed potential connection issues