diff --git a/src/ARMeilleure/Native/JitSupportDarwin.cs b/src/ARMeilleure/Native/JitSupportDarwin.cs
index 7d6a8634a..339460397 100644
--- a/src/ARMeilleure/Native/JitSupportDarwin.cs
+++ b/src/ARMeilleure/Native/JitSupportDarwin.cs
@@ -5,7 +5,7 @@ using System.Runtime.Versioning;
 namespace ARMeilleure.Native
 {
     [SupportedOSPlatform("macos")]
-    public static partial class JitSupportDarwin
+    static partial class JitSupportDarwin
     {
         [LibraryImport("libarmeilleure-jitsupport", EntryPoint = "armeilleure_jit_memcpy")]
         public static partial void Copy(IntPtr dst, IntPtr src, ulong n);
diff --git a/src/Ryujinx.Cpu/LightningJit/Arm32/InstFlags.cs b/src/Ryujinx.Cpu/LightningJit/Arm32/InstFlags.cs
index 292a33780..a1937e088 100644
--- a/src/Ryujinx.Cpu/LightningJit/Arm32/InstFlags.cs
+++ b/src/Ryujinx.Cpu/LightningJit/Arm32/InstFlags.cs
@@ -22,7 +22,6 @@ namespace Ryujinx.Cpu.LightningJit.Arm32
 
         RdnDn = Rdn | Dn,
         RdRd16 = Rd | Rd16,
-        RtRt16 = Rt | Rd16,
         RtRt2 = Rt | Rt2,
         RdLoRdHi = RdLo | RdHi,
         RdLoHi = Rd | RdHi,
diff --git a/src/Ryujinx.Cpu/LightningJit/Cache/JitCache.cs b/src/Ryujinx.Cpu/LightningJit/Cache/JitCache.cs
index 6b7c681b8..6f1191ca5 100644
--- a/src/Ryujinx.Cpu/LightningJit/Cache/JitCache.cs
+++ b/src/Ryujinx.Cpu/LightningJit/Cache/JitCache.cs
@@ -1,5 +1,4 @@
 using ARMeilleure.Memory;
-using ARMeilleure.Native;
 using Ryujinx.Memory;
 using System;
 using System.Collections.Generic;
diff --git a/src/Ryujinx.Cpu/LightningJit/Cache/JitSupportDarwin.cs b/src/Ryujinx.Cpu/LightningJit/Cache/JitSupportDarwin.cs
new file mode 100644
index 000000000..52297b435
--- /dev/null
+++ b/src/Ryujinx.Cpu/LightningJit/Cache/JitSupportDarwin.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.Versioning;
+
+namespace Ryujinx.Cpu.LightningJit.Cache
+{
+    [SupportedOSPlatform("macos")]
+    static partial class JitSupportDarwin
+    {
+        [LibraryImport("libarmeilleure-jitsupport", EntryPoint = "armeilleure_jit_memcpy")]
+        public static partial void Copy(IntPtr dst, IntPtr src, ulong n);
+    }
+}
diff --git a/src/Ryujinx.Cpu/LightningJit/State/ExecutionContext.cs b/src/Ryujinx.Cpu/LightningJit/State/ExecutionContext.cs
index 88ebfdfa1..facb9142f 100644
--- a/src/Ryujinx.Cpu/LightningJit/State/ExecutionContext.cs
+++ b/src/Ryujinx.Cpu/LightningJit/State/ExecutionContext.cs
@@ -13,7 +13,6 @@ namespace Ryujinx.Cpu.LightningJit.State
         internal IntPtr NativeContextPtr => _nativeContext.BasePtr;
 
         private bool _interrupted;
-
         private readonly ICounter _counter;
 
         public ulong Pc => _nativeContext.GetPc();
@@ -140,9 +139,15 @@ namespace Ryujinx.Cpu.LightningJit.State
             _nativeContext.SetCounter(0);
         }
 
-        public void Dispose()
+        protected virtual void Dispose(bool disposing)
         {
             _nativeContext.Dispose();
         }
+
+        public void Dispose()
+        {
+            Dispose(disposing: true);
+            GC.SuppressFinalize(this);
+        }
     }
 }