Fix metrics reporting