Fixups to match improved JSON reporting
Improved logging of entries