Tweak the analytics code