Cleanup for reporting fix