Fixing the reporting issues