Some more improvements for Metrics.