Minor changes in XML parsing mechanism