Found some more parser issues