Fixed errors caused by ClientList change to singleton