Minor improvement to output XML