Finally fix metrics so they report correctly.