diff --git a/common/src/app/common/files/migrations.cljc b/common/src/app/common/files/migrations.cljc
index 6d06c1b177..2166a5e158 100644
--- a/common/src/app/common/files/migrations.cljc
+++ b/common/src/app/common/files/migrations.cljc
@@ -484,7 +484,11 @@
 
               (contains? object :masked-group?)
               (-> (assoc :masked-group (:masked-group? object))
-                  (dissoc :masked-group?))))
+                  (dissoc :masked-group?))
+
+              (contains? object :saved-component-root?)
+              (-> (assoc :saved-component-root (:saved-component-root? object))
+                  (dissoc :saved-component-root?))))
 
           (update-container [container]
             (d/update-when container :objects update-vals update-object))]
diff --git a/common/src/app/common/geom/shapes/transforms.cljc b/common/src/app/common/geom/shapes/transforms.cljc
index 587843edab..c5503d0402 100644
--- a/common/src/app/common/geom/shapes/transforms.cljc
+++ b/common/src/app/common/geom/shapes/transforms.cljc
@@ -313,7 +313,7 @@
                   (update shape :bool-content gpa/transform-content transform-mtx)
                   shape)
         shape   (if (= type :text)
-                  (update shape :position-data move-position-data transform-mtx)
+                  (update shape :position-data transform-position-data transform-mtx)
                   shape)
         shape   (if (= type :path)
                   (update shape :content gpa/transform-content transform-mtx)
@@ -337,7 +337,7 @@
         ;; NOTE: ensure we have a fresh shallow copy of shape
         shape     (cr/clone shape)
         shape     (adjust-shape-flips! shape points)
-        
+
         center    (gco/points->center points)
         selrect   (calculate-selrect points center)
         transform (calculate-transform points center selrect)
diff --git a/frontend/src/app/main/data/workspace/selection.cljs b/frontend/src/app/main/data/workspace/selection.cljs
index c7ca8b7ea2..2c2763f759 100644
--- a/frontend/src/app/main/data/workspace/selection.cljs
+++ b/frontend/src/app/main/data/workspace/selection.cljs
@@ -425,7 +425,10 @@
            parent-id   (or parent-id frame-id)
            name        (:name obj)
 
-           is-component-root? (or (:saved-component-root? obj) (ctk/instance-root? obj))
+           is-component-root? (or (:saved-component-root obj)
+                                  ;; Backward compatibility
+                                  (:saved-component-root? obj)
+                                  (ctk/instance-root? obj))
            duplicating-component? (or duplicating-component? (ctk/instance-head? obj))
            is-component-main? (ctk/main-instance? obj)
            regenerate-component