Fixed Analytics Stuff