diff --git a/codex-rs/core/src/exec.rs b/codex-rs/core/src/exec.rs
index 75e459b102..0e831f1e91 100644
--- a/codex-rs/core/src/exec.rs
+++ b/codex-rs/core/src/exec.rs
@@ -20,7 +20,7 @@ use crate::error::Result;
 use crate::error::SandboxErr;
 use crate::executor::SandboxLaunch;
 use crate::executor::SandboxLaunchError;
-use crate::executor::sandbox::build_launch_for_sandbox;
+use crate::executor::build_launch_for_sandbox;
 use crate::protocol::Event;
 use crate::protocol::EventMsg;
 use crate::protocol::ExecCommandOutputDeltaEvent;
diff --git a/codex-rs/core/src/unified_exec/mod.rs b/codex-rs/core/src/unified_exec/mod.rs
index cb2b25011a..c60ad64755 100644
--- a/codex-rs/core/src/unified_exec/mod.rs
+++ b/codex-rs/core/src/unified_exec/mod.rs
@@ -527,10 +527,6 @@ mod tests {
         let (session, mut turn) = make_session_and_context();
         turn.approval_policy = AskForApproval::Never;
         turn.sandbox_policy = SandboxPolicy::DangerFullAccess;
-        session
-            .services
-            .executor
-            .update_environment(turn.sandbox_policy.clone(), turn.cwd.clone());
         (Arc::new(session), Arc::new(turn))
     }
 
@@ -544,7 +540,6 @@ mod tests {
     ) -> Result<UnifiedExecResult, UnifiedExecError> {
         let request_input = input;
         let request = UnifiedExecRequest {
-            session_id,
             input_chunks: &request_input,
             timeout_ms,
         };
@@ -560,6 +555,7 @@ mod tests {
                     sub_id: "sub",
                     call_id: "call",
                     tool_name: "unified_exec",
+                    session_id,
                 },
             )
             .await