diff --git a/demos/sandbox-appyx-navigation/web/src/jsMain/kotlin/com/bumble/appyx/demos/sandbox/navigation/Main.kt b/demos/sandbox-appyx-navigation/web/src/jsMain/kotlin/com/bumble/appyx/demos/sandbox/navigation/Main.kt
index a138c466a..b65cea23c 100644
--- a/demos/sandbox-appyx-navigation/web/src/jsMain/kotlin/com/bumble/appyx/demos/sandbox/navigation/Main.kt
+++ b/demos/sandbox-appyx-navigation/web/src/jsMain/kotlin/com/bumble/appyx/demos/sandbox/navigation/Main.kt
@@ -22,9 +22,9 @@ import androidx.compose.ui.input.key.onKeyEvent
 import androidx.compose.ui.input.key.type
 import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.CanvasBasedWindow
 import com.bumble.appyx.demos.sandbox.navigation.node.container.MainNavNode
 import com.bumble.appyx.demos.sandbox.navigation.ui.AppyxSampleAppTheme
-import com.bumble.appyx.navigation.integration.BrowserViewportWindow
 import com.bumble.appyx.navigation.integration.ScreenSize
 import com.bumble.appyx.navigation.integration.WebNodeHost
 import kotlinx.coroutines.CoroutineScope
@@ -35,10 +35,11 @@ import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.launch
 import org.jetbrains.skiko.wasm.onWasmReady
 
+@OptIn(ExperimentalComposeUiApi::class)
 fun main() {
     val events: Channel<Unit> = Channel()
     onWasmReady {
-        BrowserViewportWindow("Navigation Demo") {
+        CanvasBasedWindow("Navigation Demo") {
             val requester = remember { FocusRequester() }
             var hasFocus by remember { mutableStateOf(false) }
 
@@ -78,7 +79,6 @@ fun main() {
     }
 }
 
-@OptIn(ExperimentalComposeUiApi::class)
 private fun onKeyEvent(
     keyEvent: KeyEvent,
     events: Channel<Unit>,
diff --git a/documentation/navigation/multiplatform.md b/documentation/navigation/multiplatform.md
index aa9da73e6..2cf2e5d1d 100644
--- a/documentation/navigation/multiplatform.md
+++ b/documentation/navigation/multiplatform.md
@@ -138,7 +138,7 @@ fun main() = application {
 fun main() {
     val events: Channel<Unit> = Channel()
     onWasmReady {
-        BrowserViewportWindow("Your app") {
+        CanvasBasedWindow("Your app") {
             val requester = remember { FocusRequester() }
             var hasFocus by remember { mutableStateOf(false) }
             var screenSize by remember { mutableStateOf(ScreenSize(0.dp, 0.dp)) }
diff --git a/plugins/verification-plugin/src/main/kotlin/LintPlugin.kt b/plugins/verification-plugin/src/main/kotlin/LintPlugin.kt
index 698096ed6..65e8573a1 100644
--- a/plugins/verification-plugin/src/main/kotlin/LintPlugin.kt
+++ b/plugins/verification-plugin/src/main/kotlin/LintPlugin.kt
@@ -21,6 +21,7 @@ class LintPlugin : Plugin<Project> {
                 sarifReport = true
                 baseline = target.file("lint-baseline.xml")
                 warningsAsErrors = true
+                disable += listOf("ObsoleteLintCustomCheck")
             }
         }