V6 - More fixes for analytics