Some fixes to XML parsing files.