diff --git a/packages/core/src/diff/node.rs b/packages/core/src/diff/node.rs
index 861beeadc..eadc1d2b1 100644
--- a/packages/core/src/diff/node.rs
+++ b/packages/core/src/diff/node.rs
@@ -131,10 +131,10 @@ impl VNode {
                     }
                     Component(_comp) => {
                         let scope = ScopeId(mount.mounted_dynamic_nodes[*id]);
-                        match dom.get_scope(scope).unwrap().root_node() {
-                            RenderReturn::Ready(child) => child.find_first_element(dom),
-                            _ => todo!("cannot handle nonstandard nodes"),
-                        }
+                        dom.get_scope(scope)
+                            .unwrap()
+                            .root_node()
+                            .find_first_element(dom)
                     }
                 }
             }
@@ -153,10 +153,10 @@ impl VNode {
                     Fragment(t) => t.last().unwrap().find_last_element(dom),
                     Component(_comp) => {
                         let scope = ScopeId(mount.mounted_dynamic_nodes[*id]);
-                        match dom.get_scope(scope).unwrap().root_node() {
-                            RenderReturn::Ready(node) => node.find_last_element(dom),
-                            _ => todo!("cannot handle nonstandard nodes"),
-                        }
+                        dom.get_scope(scope)
+                            .unwrap()
+                            .root_node()
+                            .find_last_element(dom)
                     }
                 }
             }
diff --git a/packages/core/src/properties.rs b/packages/core/src/properties.rs
index 3467ae0ca..fda226582 100644
--- a/packages/core/src/properties.rs
+++ b/packages/core/src/properties.rs
@@ -139,10 +139,10 @@ impl<F: Fn() -> Element> ComponentFunction<ZeroElementMarker> for F {
 #[test]
 fn test_empty_builder() {
     fn app() -> Element {
-        todo!()
+        unimplemented!()
     }
     fn app2(_: ()) -> Element {
-        todo!()
+        unimplemented!()
     }
     let builder = fc_to_builder(app);
     builder.build();