Improvements to support lost of connection