Improve handling of disconnections a bit