Fix connection issues