client analytics fixes