Fixed a couple of parser bugs