Fix metrics

will merge into a single commit before it's merged into newww