Parser report fix-ups