Some parser fixes