analytics fixes