More parser bugfixes