Tidy-ups for new Metrics