more analytics fixes