connect()/disconnect() fixes