A few changes to the reporting engine