diff --git a/proposer/succinct/bin/server.rs b/proposer/succinct/bin/server.rs
index 299c070c..daaa66d2 100644
--- a/proposer/succinct/bin/server.rs
+++ b/proposer/succinct/bin/server.rs
@@ -316,7 +316,7 @@ async fn request_mock_span_proof(
     // Start the server and native client with a timeout.
     // Note: Ideally, the server should call out to a separate process that executes the native
     // host, and return an ID that the client can poll on to check if the proof was submitted.
-    let mut witnessgen_executor = WitnessGenExecutor::default();
+    let mut witnessgen_executor = WitnessGenExecutor::new(WITNESSGEN_TIMEOUT, RunContext::Docker);
     witnessgen_executor.spawn_witnessgen(&host_cli).await?;
     // Log any errors from running the witness generation process.
     let res = witnessgen_executor.flush().await;
diff --git a/scripts/utils/bin/fetch_rollup_config.rs b/scripts/utils/bin/fetch_rollup_config.rs
index 54ab45e6..61d7c457 100644
--- a/scripts/utils/bin/fetch_rollup_config.rs
+++ b/scripts/utils/bin/fetch_rollup_config.rs
@@ -38,17 +38,14 @@ struct L2OOConfig {
 fn get_address(env_var: &str) -> String {
     let private_key = env::var("PRIVATE_KEY").unwrap_or_else(|_| B256::ZERO.to_string());
 
-    env::var(env_var).map_or_else(
-        |_| {
-            if private_key == B256::ZERO.to_string() {
-                Address::ZERO.to_string()
-            } else {
-                let signer: PrivateKeySigner = private_key.parse().unwrap();
-                signer.address().to_string()
-            }
-        },
-        |addr| addr,
-    )
+    env::var(env_var).unwrap_or_else(|_| {
+        if private_key == B256::ZERO.to_string() {
+            Address::ZERO.to_string()
+        } else {
+            let signer: PrivateKeySigner = private_key.parse().unwrap();
+            signer.address().to_string()
+        }
+    })
 }
 
 /// Update the L2OO config with the rollup config hash and other relevant data before the contract is deployed.