Improve some issues with the report checking per hillbrad's review