Fixed memory issues related to AddClientCB