clientdata analytics fixes