Cleaned up some issues related to reports.