diff --git a/packages/core/src/create.rs b/packages/core/src/create.rs
index 113fa7ae1..80561e937 100644
--- a/packages/core/src/create.rs
+++ b/packages/core/src/create.rs
@@ -35,6 +35,7 @@ fn sort_bfs(paths: &[&'static [u8]]) -> Vec<(usize, &'static [u8])> {
 }
 
 #[test]
+#[cfg(debug_assertions)]
 fn sorting() {
     let r: [(usize, &[u8]); 5] = [
         (0, &[0, 1]),
diff --git a/packages/core/src/diff.rs b/packages/core/src/diff.rs
index 6f84b21aa..56a2d05de 100644
--- a/packages/core/src/diff.rs
+++ b/packages/core/src/diff.rs
@@ -148,6 +148,13 @@ impl<'b> VirtualDom {
 
         // Make sure the roots get transferred over while we're here
         right_template.root_ids.transfer(&left_template.root_ids);
+
+        // Update the node refs
+        for i in 0..right_template.root_ids.len() {
+            if let Some(root_id) = right_template.root_ids.get(i) {
+                self.update_template(root_id, right_template);
+            }
+        }
     }
 
     fn diff_dynamic_node(