more parser fixes