Analytics tweaks