Various statistics upgrades