More tweaks to metrics output