Fixed some details in the metrics.