some parser fixes