Some fixes to xml