Fixed a few parsing errors