Fixed parser bugs