Fixing parser bugs.