Fixing parser bugs