Fixes to xml