Fixed parser bugs.