Fix analytics and config