Fixed errors caused by ClientList change to singleton
Fixed errors caused by ClientList change to singleton