further XML data fixes