Fix analytics and such