Fix evaluation to report better metrics