Minor fixes in parser.