fix some parser glitches