Fixed issues with ClientDataBroker releated to recent changes.