More fixes for stats