Fixes for diagnostic data generation from the ARF report.