More fixes to stats