XML simple serializer fixes