Minor changes to XML output for objects