Fix disconnection behaviors