More metrics improvements.