Fixed a few parsing bugs