Reporting fixes