More analytics tweaking