Bug fixes in XmlWorkers