Fixing analytics