Fixing up analytics