Minor improvements to metrics output