Small improvements to reporting.