Fixed several parsing errors