Fixing connection issues