fixes in xml serialization