More analytics changes