fix some stat tracking issues