diff --git a/ARMeilleure/Translation/JitCache.cs b/ARMeilleure/Translation/JitCache.cs
index b3410d97e2..56628a45d3 100644
--- a/ARMeilleure/Translation/JitCache.cs
+++ b/ARMeilleure/Translation/JitCache.cs
@@ -93,9 +93,9 @@ namespace ARMeilleure.Translation
             return allocOffset;
         }
 
-        public static void Free(ulong address)
+        public static void Free(IntPtr address)
         {
-            ulong offset = address - (ulong)_basePointer;
+            ulong offset = (ulong)address - (ulong)_basePointer;
 
             lock (_lock)
             {
@@ -119,7 +119,7 @@ namespace ARMeilleure.Translation
         {
             lock (_lock)
             {
-                if(_cacheEntries.TryGetValue(offset, out entry))
+                if (_cacheEntries.TryGetValue(offset, out entry))
                 {
                     return true;
                 }
diff --git a/ARMeilleure/Translation/JitCacheMemoryAllocator.cs b/ARMeilleure/Translation/JitCacheMemoryAllocator.cs
index 4744b70fb4..f2ee53ec26 100644
--- a/ARMeilleure/Translation/JitCacheMemoryAllocator.cs
+++ b/ARMeilleure/Translation/JitCacheMemoryAllocator.cs
@@ -77,7 +77,7 @@ namespace ARMeilleure.Translation
         {
             if ((uint)offset >= (ulong)_size)
             {
-                throw new ArgumentOutOfRangeException();
+                throw new ArgumentOutOfRangeException("offset");
             }
 
             var node = _memoryRanges.First;
@@ -86,7 +86,7 @@ namespace ARMeilleure.Translation
             {
                 if (node == null)
                 {
-                    throw new ArgumentOutOfRangeException();
+                    throw new ArgumentOutOfRangeException("offset");
                 }
 
                 if (offset <= node.Value.End)
diff --git a/ARMeilleure/Translation/TranslatedFunction.cs b/ARMeilleure/Translation/TranslatedFunction.cs
index 831c99d04e..11ab2d94ca 100644
--- a/ARMeilleure/Translation/TranslatedFunction.cs
+++ b/ARMeilleure/Translation/TranslatedFunction.cs
@@ -6,7 +6,7 @@ namespace ARMeilleure.Translation
 {
     class TranslatedFunction
     {
-        public ulong Pointer => (ulong)Marshal.GetFunctionPointerForDelegate(_func);
+        public IntPtr Pointer => Marshal.GetFunctionPointerForDelegate(_func);
 
         public int EntryCount;
 
@@ -20,8 +20,9 @@ namespace ARMeilleure.Translation
 
         public TranslatedFunction(GuestFunction func, ulong address, bool rejit)
         {
-            _func  = func;
+            _func = func;
             _rejit = rejit;
+            _address = address;
         }
 
         public ulong Execute(State.ExecutionContext context)