Fixed several parser issues