Fixed a few parser bugs