Fixes to the OriginalParser