Minor tweaks to analytics