estimator: Fix minor reporting issues