small parser fixes