Minor changes to parser