Small changes in Parser