More fixes to connection stability