diff --git a/Cargo.lock b/Cargo.lock
index a259be614..e78be7373 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4373,7 +4373,7 @@ dependencies = [
 [[package]]
 name = "opencadcodec"
 version = "0.6.0"
-source = "git+https://github.com/HakanSeven12/opencadcodec.git?rev=f385f75#f385f75decc311b7caeefb22d4e7435d97e12edb"
+source = "git+https://github.com/HakanSeven12/opencadcodec.git?rev=278c49a#278c49a95b76cd821e292ef85f13282a79ea149d"
 dependencies = [
  "anyhow",
  "bitflags 2.13.1",
@@ -4396,7 +4396,7 @@ dependencies = [
 [[package]]
 name = "opencadgraph"
 version = "0.1.0"
-source = "git+https://github.com/HakanSeven12/opencadgraph.git?rev=e9c23ad#e9c23adb0facdd00d043ca9aeb6a5dacf0208779"
+source = "git+https://github.com/HakanSeven12/opencadgraph.git?rev=3b3a03d#3b3a03d47bc431999b8cdd10b9379c90afda2a7d"
 dependencies = [
  "opencadkernel",
  "serde_json",
@@ -4405,7 +4405,7 @@ dependencies = [
 [[package]]
 name = "opencadkernel"
 version = "0.1.0"
-source = "git+https://github.com/HakanSeven12/opencadkernel.git?rev=9841749#9841749422c8fb0fa1f68205ac725d27f13e13bd"
+source = "git+https://github.com/HakanSeven12/opencadkernel.git?rev=46e5bf8#46e5bf8004d8bcb908ba7243f22d207659c084b2"
 dependencies = [
  "cavalier_contours",
  "opencadcodec",
@@ -4416,7 +4416,7 @@ dependencies = [
 [[package]]
 name = "opencadkernel-constraints"
 version = "0.1.0"
-source = "git+https://github.com/HakanSeven12/opencadkernel.git?rev=9841749#9841749422c8fb0fa1f68205ac725d27f13e13bd"
+source = "git+https://github.com/HakanSeven12/opencadkernel.git?rev=46e5bf8#46e5bf8004d8bcb908ba7243f22d207659c084b2"
 dependencies = [
  "nalgebra",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 832fec9bc..edb3b7117 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,10 +37,10 @@ rfd = "0.17"
 clap = { version = "4", features = ["derive", "string"] }
 env_logger = "0.11"
 log = "0.4"
-codec = { package = "opencadcodec", git = "https://github.com/HakanSeven12/opencadcodec.git", rev = "f385f75", features = ["serde"] }
-kernel = { package = "opencadkernel", git = "https://github.com/HakanSeven12/opencadkernel.git", rev = "9841749", features = ["acis", "offset"] }
-kernel-constraints = { package = "opencadkernel-constraints", git = "https://github.com/HakanSeven12/opencadkernel.git", rev = "9841749" }
-graph = { package = "opencadgraph", git = "https://github.com/HakanSeven12/opencadgraph.git", rev = "e9c23ad" }
+codec = { package = "opencadcodec", git = "https://github.com/HakanSeven12/opencadcodec.git", rev = "278c49a", features = ["serde"] }
+kernel = { package = "opencadkernel", git = "https://github.com/HakanSeven12/opencadkernel.git", rev = "46e5bf8", features = ["acis", "offset"] }
+kernel-constraints = { package = "opencadkernel-constraints", git = "https://github.com/HakanSeven12/opencadkernel.git", rev = "46e5bf8" }
+graph = { package = "opencadgraph", git = "https://github.com/HakanSeven12/opencadgraph.git", rev = "3b3a03d" }
 dwg-thumbnailer = { path = "crates/dwg-thumbnailer" }
 # Shared SAVE serialization dispatch + web-worker wire format: one
 # implementation for the inline (fallback/native) path and the worker path.
diff --git a/crates/ocs_plugin_api/Cargo.toml b/crates/ocs_plugin_api/Cargo.toml
index b61a1fba7..a38f09f35 100644
--- a/crates/ocs_plugin_api/Cargo.toml
+++ b/crates/ocs_plugin_api/Cargo.toml
@@ -15,7 +15,7 @@ serde_json = { version = "1", optional = true }
 # Pulled in only by the `host` feature, which adds the `opencadcodec`-typed
 # `HostApi` runtime surface. The default crate stays dependency-free so engine
 # crates and external tooling can depend on the manifest/ribbon contract cheaply.
-codec = { package = "opencadcodec", git = "https://github.com/HakanSeven12/opencadcodec.git", rev = "f385f75", optional = true, features = ["serde"] }
+codec = { package = "opencadcodec", git = "https://github.com/HakanSeven12/opencadcodec.git", rev = "278c49a", optional = true, features = ["serde"] }
 
 # Runtime IPC and serialization (host feature only).
 interprocess = { version = "2", optional = true }
@@ -39,7 +39,7 @@ serde_json = "1"
 serde = { version = "1", features = ["derive"] }
 cargo-lock = "11"
 # opencadcodec is scanned at build time to generate the embedded type registry.
-codec = { package = "opencadcodec", git = "https://github.com/HakanSeven12/opencadcodec.git", rev = "f385f75", features = ["serde"] }
+codec = { package = "opencadcodec", git = "https://github.com/HakanSeven12/opencadcodec.git", rev = "278c49a", features = ["serde"] }
 
 [dev-dependencies]
 serde_json = "1"
diff --git a/crates/ocs_save/Cargo.toml b/crates/ocs_save/Cargo.toml
index c7e1a17e9..848f73427 100644
--- a/crates/ocs_save/Cargo.toml
+++ b/crates/ocs_save/Cargo.toml
@@ -10,6 +10,6 @@ publish = false
 # exactly one implementation. No UI/app dependencies — only the codec + serde.
 
 [dependencies]
-codec = { package = "opencadcodec", git = "https://github.com/HakanSeven12/opencadcodec.git", rev = "f385f75", features = ["serde"] }
+codec = { package = "opencadcodec", git = "https://github.com/HakanSeven12/opencadcodec.git", rev = "278c49a", features = ["serde"] }
 bincode = "1.3"
 serde = { version = "1", features = ["derive"] }
diff --git a/crates/ocs_web_worker/Cargo.toml b/crates/ocs_web_worker/Cargo.toml
index 24b9b090c..380980ed8 100644
--- a/crates/ocs_web_worker/Cargo.toml
+++ b/crates/ocs_web_worker/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 crate-type = ["cdylib"]
 
 [dependencies]
-codec = { package = "opencadcodec", git = "https://github.com/HakanSeven12/opencadcodec.git", rev = "f385f75", features = ["serde"] }
+codec = { package = "opencadcodec", git = "https://github.com/HakanSeven12/opencadcodec.git", rev = "278c49a", features = ["serde"] }
 bincode = "1.3"
 serde = { version = "1", features = ["derive"] }
 console_error_panic_hook = "0.1"
diff --git a/plugins/opencad-python/Cargo.lock b/plugins/opencad-python/Cargo.lock
index af00d623b..54dcfc3c5 100644
--- a/plugins/opencad-python/Cargo.lock
+++ b/plugins/opencad-python/Cargo.lock
@@ -1264,7 +1264,7 @@ dependencies = [
 [[package]]
 name = "opencadcodec"
 version = "0.6.0"
-source = "git+https://github.com/HakanSeven12/opencadcodec.git?rev=f385f75#f385f75decc311b7caeefb22d4e7435d97e12edb"
+source = "git+https://github.com/HakanSeven12/opencadcodec.git?rev=278c49a#278c49a95b76cd821e292ef85f13282a79ea149d"
 dependencies = [
  "anyhow",
  "bitflags",
diff --git a/src/scene/dwg_native_constraints.rs b/src/scene/dwg_native_constraints.rs
index 152b3168c..78e8d29e5 100644
--- a/src/scene/dwg_native_constraints.rs
+++ b/src/scene/dwg_native_constraints.rs
@@ -3888,6 +3888,7 @@ fn materialize_scope(
             work_plane: [Vector3::ZERO, Vector3::UNIT_X, Vector3::UNIT_Y],
             dependency: Handle::NULL,
             actions: group_dependencies,
+            next_node_id: 0,
             nodes,
         };
         allocator.insert_associative_at(