Additional analytics tracking tweaks