Fix up analytics tracking