Fixed XML (de)serialization