Fixes in the parser