Ugh, more fixes to analytics.