Fix more crashes relating to new stat code