merged parser fixes