Reporting tweaks