diff --git a/src/agents/mcp/server.py b/src/agents/mcp/server.py
index e70d7ce6..9a137bbd 100644
--- a/src/agents/mcp/server.py
+++ b/src/agents/mcp/server.py
@@ -137,9 +137,10 @@ async def cleanup(self):
         async with self._cleanup_lock:
             try:
                 await self.exit_stack.aclose()
-                self.session = None
             except Exception as e:
                 logger.error(f"Error cleaning up server: {e}")
+            finally:
+                self.session = None
 
 
 class MCPServerStdioParams(TypedDict):
diff --git a/src/agents/tracing/processors.py b/src/agents/tracing/processors.py
index f929d05d..2913b11a 100644
--- a/src/agents/tracing/processors.py
+++ b/src/agents/tracing/processors.py
@@ -102,6 +102,12 @@ def export(self, items: list[Trace | Span[Any]]) -> None:
             "OpenAI-Beta": "traces=v1",
         }
 
+        if self.organization:
+            headers["OpenAI-Organization"] = self.organization
+
+        if self.project:
+            headers["OpenAI-Project"] = self.project
+
         # Exponential backoff loop
         attempt = 0
         delay = self.base_delay
diff --git a/src/agents/tracing/span_data.py b/src/agents/tracing/span_data.py
index 1a450280..cb3e8491 100644
--- a/src/agents/tracing/span_data.py
+++ b/src/agents/tracing/span_data.py
@@ -338,7 +338,7 @@ def __init__(
 
     @property
     def type(self) -> str:
-        return "speech-group"
+        return "speech_group"
 
     def export(self) -> dict[str, Any]:
         return {