Small fixes related to AnalyticsIT