diff --git a/examples/use_web_lock/Cargo.toml b/examples/use_web_lock/Cargo.toml
index 7d97f04..86fca33 100644
--- a/examples/use_web_lock/Cargo.toml
+++ b/examples/use_web_lock/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 gloo-timers = { version = "0.3", features = ["futures"] }
-leptos = { version = "0.6", features = ["nightly", "csr"] }
+leptos = { workspace = true, features = ["nightly", "csr"] }
 console_error_panic_hook = "0.1"
 console_log = "1"
 log = "0.4"
diff --git a/examples/use_web_lock/src/main.rs b/examples/use_web_lock/src/main.rs
index c84c047..0cb67f6 100644
--- a/examples/use_web_lock/src/main.rs
+++ b/examples/use_web_lock/src/main.rs
@@ -1,5 +1,6 @@
 use gloo_timers::future::sleep;
-use leptos::*;
+use leptos::prelude::*;
+use leptos::task::spawn_local;
 use leptos_use::docs::demo_or_body;
 use leptos_use::use_web_lock;
 use std::time::Duration;
@@ -12,7 +13,7 @@ async fn my_process(_lock: web_sys::Lock) -> i32 {
 
 #[component]
 fn Demo() -> impl IntoView {
-    let (res, set_res) = create_signal("Not started yet".to_string());
+    let (res, set_res) = signal("Not started yet".to_string());
 
     let on_click = move |_| {
         set_res.set("Running...".to_string());
@@ -41,7 +42,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }
diff --git a/examples/use_window_size/Cargo.toml b/examples/use_window_size/Cargo.toml
index f59a15e..809cf92 100644
--- a/examples/use_window_size/Cargo.toml
+++ b/examples/use_window_size/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["nightly", "csr"] }
+leptos = { workspace = true, features = ["nightly", "csr"] }
 console_error_panic_hook = "0.1"
 console_log = "1"
 log = "0.4"
diff --git a/examples/use_window_size/src/main.rs b/examples/use_window_size/src/main.rs
index a253011..376e640 100644
--- a/examples/use_window_size/src/main.rs
+++ b/examples/use_window_size/src/main.rs
@@ -1,4 +1,4 @@
-use leptos::*;
+use leptos::prelude::*;
 use leptos_use::docs::demo_or_body;
 use leptos_use::{use_window_size, UseWindowSizeReturn};
 
@@ -7,7 +7,7 @@ fn Demo() -> impl IntoView {
     let UseWindowSizeReturn { width, height } = use_window_size();
 
     view! {
-        <p>{{ width }} x {{ height }}</p>
+        <p>{ width } x { height }</p>
     }
 }
 
@@ -15,7 +15,9 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    mount_to(demo_or_body(), || {
+    let unmount_handle = leptos::mount::mount_to(demo_or_body(), || {
         view! { <Demo/> }
-    })
+    });
+
+    unmount_handle.forget();
 }