Fixed some parser bugs.