Fixed various issues with the display of metrics.