Small tweaks to parser