Fine grain control on stats update

Fix #2141