minor parser fixes