Bug fixes and improvements to reporting.