Better reconnecting and disconnecting behavior