[dev] A few stats patches