Fixed connection issues