Fixed regressions in reports after last merge.