changes to make reporting metrics work

Had to make some changes to make uploading metrics work.