Merge "Fix some issues reading xml"