Fixed two parser bugs.
