diff --git a/sample/Assets/Editor/MacBuilder.cs b/sample/Assets/Editor/MacBuilder.cs
index 4bb0b482..76575273 100644
--- a/sample/Assets/Editor/MacBuilder.cs
+++ b/sample/Assets/Editor/MacBuilder.cs
@@ -114,7 +114,7 @@ public static void RemoveAltFromScene(string scene)
         var sceneToModify = EditorSceneManager.OpenScene(scene);
 
         // Find the AltTesterPrefab instance in the scene
-        var altRunner = GameObject.FindObjectOfType<AltRunner>();
+        var altRunner = GameObject.FindFirstObjectByType<AltRunner>();
 
         if (altRunner != null)
         {
diff --git a/sample/Assets/Editor/MobileBuilder.cs b/sample/Assets/Editor/MobileBuilder.cs
index 897aad39..40a52185 100644
--- a/sample/Assets/Editor/MobileBuilder.cs
+++ b/sample/Assets/Editor/MobileBuilder.cs
@@ -98,7 +98,7 @@ private static string GetBundleIdentifierFromArgs()
         return "com.immutable.Immutable-Sample";
     }
 
-    private static string GetAltTesterHostFromArgs()
+    private static string? GetAltTesterHostFromArgs()
     {
         string[] args = Environment.GetCommandLineArgs();
         for (int i = 0; i < args.Length; i++)
@@ -165,7 +165,7 @@ public static void RemoveAltFromScene(string scene)
         var sceneToModify = EditorSceneManager.OpenScene(scene);
 
         // Find the AltTesterPrefab instance in the scene
-        var altRunner = GameObject.FindObjectOfType<AltRunner>();
+        var altRunner = GameObject.FindFirstObjectByType<AltRunner>();
 
         if (altRunner != null)
         {
diff --git a/sample/Assets/Editor/WindowsBuilder.cs b/sample/Assets/Editor/WindowsBuilder.cs
index 59f41381..833d243a 100644
--- a/sample/Assets/Editor/WindowsBuilder.cs
+++ b/sample/Assets/Editor/WindowsBuilder.cs
@@ -114,7 +114,7 @@ public static void RemoveAltFromScene(string scene)
         var sceneToModify = EditorSceneManager.OpenScene(scene);
 
         // Find the AltTesterPrefab instance in the scene
-        var altRunner = GameObject.FindObjectOfType<AltRunner>();
+        var altRunner = GameObject.FindFirstObjectByType<AltRunner>();
 
         if (altRunner != null)
         {
diff --git a/sample/Assets/Scripts/Passport/AuthenticatedScript.cs b/sample/Assets/Scripts/Passport/AuthenticatedScript.cs
index e960296a..587c4e4d 100644
--- a/sample/Assets/Scripts/Passport/AuthenticatedScript.cs
+++ b/sample/Assets/Scripts/Passport/AuthenticatedScript.cs
@@ -37,7 +37,7 @@ public class AuthenticatedScript : MonoBehaviour
     private Passport Passport;
 #pragma warning restore CS8618
 
-    async void Start()
+    void Start()
     {
         if (Passport.Instance != null)
         {
@@ -165,8 +165,8 @@ public async void GetLinkedAddresses()
         {
             ShowOutput($"Failed to get linked addresses: {ex.Message}");
         }
-    }
-
+    }
+
     /// <summary>
     /// Navigates to Link Wallet scene.
     /// </summary>
diff --git a/sample/Assets/Scripts/Passport/SelectAuthMethodScript.cs b/sample/Assets/Scripts/Passport/SelectAuthMethodScript.cs
index 145e0d92..d8517f66 100644
--- a/sample/Assets/Scripts/Passport/SelectAuthMethodScript.cs
+++ b/sample/Assets/Scripts/Passport/SelectAuthMethodScript.cs
@@ -81,7 +81,7 @@ public void UsePKCE()
     /// authorisation has been granted by the user</param>
     /// <param name="logoutRedirectUri">The URL to which auth will redirect the browser
     /// after log out is complete</param>
-    private async void InitialisePassport(string redirectUri = null, string logoutRedirectUri = null)
+    private async void InitialisePassport(string? redirectUri = null, string? logoutRedirectUri = null)
     {
         ShowOutput("Initialising Passport...");
 
diff --git a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/dev.voltstro.unitywebbrowser@2.2.5/Runtime/UwbWebView.cs b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/dev.voltstro.unitywebbrowser@2.2.5/Runtime/UwbWebView.cs
index 57a155c4..80418220 100644
--- a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/dev.voltstro.unitywebbrowser@2.2.5/Runtime/UwbWebView.cs
+++ b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/dev.voltstro.unitywebbrowser@2.2.5/Runtime/UwbWebView.cs
@@ -62,26 +62,25 @@ public async UniTask Init(int engineStartupTimeoutMs)
             webBrowserClient.initialUrl = GameBridge.GetFilePath();
 
             // Set up engine
-            webBrowserClient.engine = new EngineConfiguration
+            EngineConfiguration engineConfig = ScriptableObject.CreateInstance<EngineConfiguration>();
+            engineConfig.engineAppName = "UnityWebBrowser.Engine.Cef";
+            engineConfig.engineFiles = new Engine.EnginePlatformFiles[]
             {
-                engineFiles = new Engine.EnginePlatformFiles[]
+                new Engine.EnginePlatformFiles()
                 {
-                    new()
-                    {
-                        platform = Platform.Windows64,
-                        engineBaseAppLocation = "",
-                        engineRuntimeLocation = "UWB/"
+                    platform = Platform.Windows64,
+                    engineBaseAppLocation = "",
+                    engineRuntimeLocation = "UWB/"
 #if UNITY_EDITOR
-                        ,
-                        engineEditorLocation = "Packages/com.immutable.passport/Runtime/ThirdParty/UnityWebBrowser/dev.voltstro.unitywebbrowser.engine.cef.win.x64@2.2.5-130.1.16/Engine~"
+                    ,
+                    engineEditorLocation = "Packages/com.immutable.passport/Runtime/ThirdParty/UnityWebBrowser/dev.voltstro.unitywebbrowser.engine.cef.win.x64@2.2.5-130.1.16/Engine~"
 #endif
-                    }
-                },
-                engineAppName = "UnityWebBrowser.Engine.Cef"
+                }
             };
+            webBrowserClient.engine = engineConfig;
 
             // Find available ports
-            var tcpCommunicationLayer = new TCPCommunicationLayer();
+            TCPCommunicationLayer tcpCommunicationLayer = ScriptableObject.CreateInstance<TCPCommunicationLayer>();
             var rnd = new System.Random();
             do
             {