Small parser fixes