Fixed some issues where current servers connecting list would not get correctly cleaned up