Fixed up the XML serialization some more