[CLEANUP] - Changes in Reporting were causing compilation errors