Fix analytics to be an instance