Hotfix analytics

This has already been merged into master.  It needs to be merged into dev to make sure everything stays up to date the way it should.