Small fixes in parser