Fixing up XML serialization