More parser fixes