A few fixes for our Analytics

Second time working with Thomas. He’s responsive, fast, helpful, and highly skilled.