Fixing Analytics