Couple corrections to client discarding of connections logic