Improve retry logic. Remove ConnectionLost