Minor changes to the parser