Let's fix those analytics