Fixes to XML