Also fix a couple metrics that were named wrong or reported in excess.
Attach a file by drag & drop or click to upload
