diff --git a/src/LibRyujinx/LibRyujinx.cs b/src/LibRyujinx/LibRyujinx.cs
index dd5278891..5ddbff16b 100644
--- a/src/LibRyujinx/LibRyujinx.cs
+++ b/src/LibRyujinx/LibRyujinx.cs
@@ -663,13 +663,13 @@ namespace LibRyujinx
         {
             if (SwitchDevice is { } switchDevice)
             {
-                switchDevice.HostUiHandler = new AndroidUiHandler();
+                switchDevice.HostUiHandler = new AndroidUIHandler();
             }
         }
 
         public static void WaitUiHandler()
         {
-            if (SwitchDevice?.HostUiHandler is AndroidUiHandler uiHandler)
+            if (SwitchDevice?.HostUiHandler is AndroidUIHandler uiHandler)
             {
                 uiHandler.Wait();
             }
@@ -677,7 +677,7 @@ namespace LibRyujinx
 
         public static void StopUiHandlerWait()
         {
-            if (SwitchDevice?.HostUiHandler is AndroidUiHandler uiHandler)
+            if (SwitchDevice?.HostUiHandler is AndroidUIHandler uiHandler)
             {
                 uiHandler.Set();
             }
@@ -685,7 +685,7 @@ namespace LibRyujinx
 
         public static void SetUiHandlerResponse(bool isOkPressed, long input)
         {
-            if (SwitchDevice?.HostUiHandler is AndroidUiHandler uiHandler)
+            if (SwitchDevice?.HostUiHandler is AndroidUIHandler uiHandler)
             {
                 uiHandler.SetResponse(isOkPressed, input);
             }
diff --git a/src/LibRyujinx/VulkanLoader.cs b/src/LibRyujinx/VulkanLoader.cs
index 5b832b3b4..7a5f95463 100644
--- a/src/LibRyujinx/VulkanLoader.cs
+++ b/src/LibRyujinx/VulkanLoader.cs
@@ -59,7 +59,6 @@ namespace LibRyujinx
                 {
                     var xPtr = Marshal.StringToHGlobalAnsi(x);
                     byte* xp = (byte*)xPtr;
-                    LibRyujinx.debug_break(0);
                     try
                     {
                         nint ptr = default;
diff --git a/src/Ryujinx.Common/ReleaseInformation.cs b/src/Ryujinx.Common/ReleaseInformation.cs
index 7b0490720..bd7d1bc21 100644
--- a/src/Ryujinx.Common/ReleaseInformation.cs
+++ b/src/Ryujinx.Common/ReleaseInformation.cs
@@ -28,6 +28,6 @@ namespace Ryujinx.Common
 
         public static bool IsFlatHubBuild => IsValid && ReleaseChannelOwner.Equals(FlatHubChannelOwner);
 
-        public static string Version => SystemInfo.SystemInfo.IsBionic ? "Android_1.0" : OperatingSystem.IsIOS() ? "iOS" : IsValid ? BuildVersion : !RuntimeFeature.IsDynamicCodeCompiled ? "libryujinx" : Assembly.GetEntryAssembly()!.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion;
+        public static string Version => PlatformInfo.IsBionic ? "Android_1.0" : OperatingSystem.IsIOS() ? "iOS" : IsValid ? BuildVersion : !RuntimeFeature.IsDynamicCodeCompiled ? "libryujinx" : Assembly.GetEntryAssembly()!.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion;
     }
 }
diff --git a/src/Ryujinx.Cpu/Nce/NceCpuContext.cs b/src/Ryujinx.Cpu/Nce/NceCpuContext.cs
index 8a02a1312..255c45ab0 100644
--- a/src/Ryujinx.Cpu/Nce/NceCpuContext.cs
+++ b/src/Ryujinx.Cpu/Nce/NceCpuContext.cs
@@ -1,4 +1,3 @@
-using Ryujinx.Cpu.Jit;
 using Ryujinx.Cpu.Signal;
 using Ryujinx.Common;
 using Ryujinx.Memory;
diff --git a/src/Ryujinx.Cpu/Nce/NceExecutionContext.cs b/src/Ryujinx.Cpu/Nce/NceExecutionContext.cs
index 4e609d968..37069939e 100644
--- a/src/Ryujinx.Cpu/Nce/NceExecutionContext.cs
+++ b/src/Ryujinx.Cpu/Nce/NceExecutionContext.cs
@@ -171,4 +171,4 @@ namespace Ryujinx.Cpu.Nce
             _context.Dispose();
         }
     }
-}
\ No newline at end of file
+}