Small changes to the parser