diff --git a/codex-rs/core/src/context_manager/history.rs b/codex-rs/core/src/context_manager/history.rs
index 44f087e4f2..b3bf441254 100644
--- a/codex-rs/core/src/context_manager/history.rs
+++ b/codex-rs/core/src/context_manager/history.rs
@@ -138,7 +138,9 @@ impl ContextManager {
     pub(crate) fn new() -> Self {
         Self {
             items: Vec::new(),
-            token_info: TokenUsageInfo::new_or_append(&None, &None, None),
+            token_info: TokenUsageInfo::new_or_append(
+                &None, &None, /*model_context_window*/ None,
+            ),
             reference_turn_context_state: ReferenceTurnContextState::default(),
         }
     }
diff --git a/codex-rs/core/src/state/session.rs b/codex-rs/core/src/state/session.rs
index 0f44f5de28..d8d6cfae91 100644
--- a/codex-rs/core/src/state/session.rs
+++ b/codex-rs/core/src/state/session.rs
@@ -77,7 +77,7 @@ impl SessionState {
             Some(turn_context_item) => self
                 .history
                 .note_model_visible_turn_context(turn_context_item),
-            None => self.history.set_reference_context_item(None),
+            None => self.history.set_reference_context_item(/*item*/ None),
         }
     }