Minor tweaks in the xml parsing