Fixed the reporting routines