Fixed a couple of bugs in parser