Minor changes in parser