Merge "Fix warnings in the new XML code."