Fix analytics and JS inclusion