Fix disconnect events