Fix disconnect callbacks