fix two failing XmlTest cases, possibly related to fix for #1184;