diff --git a/src/cls/IPM/Utils/Migration.cls b/src/cls/IPM/Utils/Migration.cls
index bbf4eddb..15378765 100644
--- a/src/cls/IPM/Utils/Migration.cls
+++ b/src/cls/IPM/Utils/Migration.cls
@@ -24,8 +24,8 @@ ClassMethod RunAll(verbose As %Boolean = 1) As %Status
         }
         Try {
             Set $Namespace = $Zstrip(ns,"<>WC")
+            Do ..MigrateReposFromIPM09(verbose) // Do this first; MigrateZPMToIPM will fail with <FRAMESTACK> otherwise.
             Do ..MigrateZPMToIPM(verbose)
-            Do ..MigrateReposFromIPM09(verbose)
         } Catch e {
             Set sc = $$$ADDSC(sc, e.AsStatus())
         }
@@ -176,9 +176,6 @@ ClassMethod MigrateRepoDefinitions(verbose As %Boolean = 1) As %Status
             }
         }
 
-        // Need to kill indices first to avoid a <FRAMESTACK> saving an existing Remote repo
-        Kill ^IPM.Repo.DefinitionI
-
         TSTART
         Set key = ""
         For {