Upgrade metrics to reduce the noise a bit