Improve the reporting.