diff --git a/ZuneHost.Wpf/MainWindow.xaml.cs b/ZuneHost.Wpf/MainWindow.xaml.cs
index e03714f..9ef6cc7 100644
--- a/ZuneHost.Wpf/MainWindow.xaml.cs
+++ b/ZuneHost.Wpf/MainWindow.xaml.cs
@@ -76,11 +76,11 @@ namespace ZuneHost.Wpf
             }
 
             // Set decompiler breakpoints
-            IrisApp.DebugSettings.Breakpoints.Add(new("clr-res://ZuneShell!AddToCollection.uix", 325, true));
-            IrisApp.DebugSettings.Breakpoints.Add(new("clr-res://ZuneShell!Styles.uix", 0x83, true));
-            IrisApp.DebugSettings.Breakpoints.Add(new("clr-res://ZuneShell!QuickplayStrip.uix", 172, 25, false));
-            IrisApp.DebugSettings.Breakpoints.Add(new("clr-res://ZuneMarketplaceResources!SelectionActions.uix", 121, 14, false));
-            IrisApp.DebugSettings.Breakpoints.Add(new("clr-res://ZuneShell!Quickplay.uix", 917, 62, false));
+            //IrisApp.DebugSettings.Breakpoints.Add(new("clr-res://ZuneShell!AddToCollection.uix", 325, true));
+            //IrisApp.DebugSettings.Breakpoints.Add(new("clr-res://ZuneShell!Styles.uix", 0x83, true));
+            //IrisApp.DebugSettings.Breakpoints.Add(new("clr-res://ZuneShell!QuickplayStrip.uix", 172, 25, false));
+            //IrisApp.DebugSettings.Breakpoints.Add(new("clr-res://ZuneMarketplaceResources!SelectionActions.uix", 121, 14, false));
+            //IrisApp.DebugSettings.Breakpoints.Add(new("clr-res://ZuneShell!Quickplay.uix", 917, 62, false));
 
             IntPtr hWnd = new System.Windows.Interop.WindowInteropHelper(this).Handle;
             Thread zuneThread = new(new ThreadStart(() =>
@@ -93,8 +93,12 @@ namespace ZuneHost.Wpf
 
                 Microsoft.Zune.Shell.ZuneApplication.Launch(strArgs, hWnd, () =>
                 {
-                    var debugger = new Microsoft.Iris.Debug.InProcDebugger();
-                    //debugger.InterpreterExecute += Bridge_InterpreterStep;
+                    var debugger = new Microsoft.Iris.DebugAdapter.Server.IrisDebugAdapterServer(new()
+                    {
+                        ConnectionString = @"\\.\pipe\IrisUIX_OpenZune_WPFHost",
+                        SymbolDir = @"E:\Repos\ZuneDev\ZuneUIXTools\test\syms",
+                        SourceDir = @"E:\Repos\ZuneDev\ZuneUIXTools\test",
+                    });
                     return debugger;
                 });
             }));
diff --git a/ZuneShell/Microsoft/Zune/Shell/StandAlone.cs b/ZuneShell/Microsoft/Zune/Shell/StandAlone.cs
index ec5b88e..d2bf2c1 100644
--- a/ZuneShell/Microsoft/Zune/Shell/StandAlone.cs
+++ b/ZuneShell/Microsoft/Zune/Shell/StandAlone.cs
@@ -65,7 +65,7 @@ namespace Microsoft.Zune.Shell
                             catch (FormatException) { }
                             break;
                         case "uixdebuguri":
-                            var debugConnectionUri = commandLineArgument.Value ?? DebugRemoting.DEFAULT_TCP_URI.OriginalString;
+                            var debugConnectionUri = new Uri(commandLineArgument.Value) ?? DebugRemoting.DEFAULT_TCP_URI;
                             debuggerFactory = () => new Iris.Debug.SystemNet.NetDebuggerServer(debugConnectionUri);
                             break;
                         case "uixtrace":
diff --git a/libs/MicrosoftIris b/libs/MicrosoftIris
index a2b3add..fb24662 160000
--- a/libs/MicrosoftIris
+++ b/libs/MicrosoftIris
@@ -1 +1 @@
-Subproject commit a2b3addfc19a9d1f172197ec206505a26b2e95ff
+Subproject commit fb24662492cd75ab81dfeb82de2a9b4b1157ff4d