Misc small fixes to plotMetrics.R