diff --git a/common/src/app/common/uuid.cljc b/common/src/app/common/uuid.cljc
index 9e2f7f6ee..fd72bdc56 100644
--- a/common/src/app/common/uuid.cljc
+++ b/common/src/app/common/uuid.cljc
@@ -94,7 +94,7 @@
      [this]
      (let [buffer (unchecked-get this "__u32_buffer")]
        (if (nil? buffer)
-         (let [buffer (get-unsigned-parts (.-uuid ^UUID this))]
+         (let [buffer (get-unsigned-parts this)]
            (unchecked-set this "__u32_buffer" buffer)
            buffer)
          buffer))))
diff --git a/frontend/src/app/render_wasm/shape.cljs b/frontend/src/app/render_wasm/shape.cljs
index 5082fbf3d..df8beec4d 100644
--- a/frontend/src/app/render_wasm/shape.cljs
+++ b/frontend/src/app/render_wasm/shape.cljs
@@ -153,8 +153,6 @@
     (ShapeProxy. (.-id ^ShapeProxy self)
                  nil
                  (.-delegate ^ShapeProxy self))
-
-    :else
     (let [delegate  (.-delegate ^ShapeProxy self)
           delegate' (dissoc delegate k)]
       (if (identical? delegate delegate')