Fix disconnects