minor fixes in the parser