diff --git a/rust/agents/relayer/src/msg/metadata/base.rs b/rust/agents/relayer/src/msg/metadata/base.rs
index 0e7349fc95..c05c1e6316 100644
--- a/rust/agents/relayer/src/msg/metadata/base.rs
+++ b/rust/agents/relayer/src/msg/metadata/base.rs
@@ -187,7 +187,6 @@ impl BaseMetadataBuilder {
             .origin_validator_announce
             .get_announced_storage_locations(validators)
             .await?;
-        println!("storage_locations: {:?}", storage_locations);
 
         // Only use the most recently announced location for now.
         let mut checkpoint_syncers: HashMap<H160, Arc<dyn CheckpointSyncer>> = HashMap::new();
diff --git a/rust/utils/run-locally/src/main.rs b/rust/utils/run-locally/src/main.rs
index 5a9778aa61..86d5c60844 100644
--- a/rust/utils/run-locally/src/main.rs
+++ b/rust/utils/run-locally/src/main.rs
@@ -137,7 +137,7 @@ fn main() -> ExitCode {
 
     // let solana_checkpoint_path = Path::new(SOLANA_CHECKPOINT_LOCATION);
     // fs::remove_dir_all(solana_checkpoint_path).unwrap_or_default();
-    let checkpoints_dirs: Vec<DynPath> = (0..VALIDATOR_COUNT)
+    let checkpoints_dirs: Vec<DynPath> = (0..VALIDATOR_COUNT - 1)
         .map(|_| Box::new(tempdir().unwrap()) as DynPath)
         // .chain([Box::new(solana_checkpoint_path) as DynPath])
         .collect();
diff --git a/typescript/sdk/src/ism/HyperlaneIsmFactory.ts b/typescript/sdk/src/ism/HyperlaneIsmFactory.ts
index fc9de3053a..bce111098d 100644
--- a/typescript/sdk/src/ism/HyperlaneIsmFactory.ts
+++ b/typescript/sdk/src/ism/HyperlaneIsmFactory.ts
@@ -75,7 +75,9 @@ export class HyperlaneIsmFactory extends HyperlaneApp<FactoryFactories> {
         config,
         this.multiProvider.getSignerOrProvider(chain),
       );
-    } else if (
+    }
+
+    if (
       config.type === ModuleType.MERKLE_ROOT_MULTISIG ||
       config.type === ModuleType.MESSAGE_ID_MULTISIG
     ) {
@@ -112,11 +114,10 @@ export class HyperlaneIsmFactory extends HyperlaneApp<FactoryFactories> {
       this.deployedIsms[chain] = {};
     }
 
-    if (!!origin && !this.deployedIsms[chain][origin]) {
-      this.deployedIsms[chain][origin] = {};
-    }
-
-    if (origin) {
+    if (!!origin) {
+      if (!this.deployedIsms[chain][origin]) {
+        this.deployedIsms[chain][origin] = {};
+      }
       this.deployedIsms[chain][origin][moduleType] = contract;
     } else {
       this.deployedIsms[chain][moduleType] = contract;