Reporting fixes and improvements