Small environment fixes for analytics