[FOLD] Reporting fixes
[FOLD] Logic reporting