Connection and disconnection enhancements