Fix analytics integration