Tweaks to error aggregation