diff --git a/include/d/d_heap_alloc.h b/include/d/d_heap_alloc.h
index dec77133..4fd3a47a 100644
--- a/include/d/d_heap_alloc.h
+++ b/include/d/d_heap_alloc.h
@@ -18,17 +18,12 @@ public:
             EGG::HeapAllocCallback oldAllocCallback = EGG::Heap::sAllocCallback;
             EGG::HeapFreeCallback oldFreeCallback = EGG::Heap::sFreeCallback;
 
-            // first mention free, then alloc so that the
-            //inline thunks are emitted in the right order
-            EGG::HeapFreeCallback freeThunk = &freeCallback;
-            EGG::HeapAllocCallback allocThunk = &allocCallback;
-
-            EGG::Heap::sAllocCallback = allocThunk;
+            EGG::Heap::sAllocCallback = &allocCallback;
             EGG::Heap::sAllocCallbackArg = this;
             mPreviousAllocCallback = oldAllocCallback;
             mPreviousAllocCallbackArg = oldAllocCallbackArg;
 
-            EGG::Heap::sFreeCallback = freeThunk;
+            EGG::Heap::sFreeCallback = &freeCallback;
             EGG::Heap::sFreeCallbackArg = this;
             mPreviousFreeCallback = oldFreeCallback;
             mPreviousFreeCallbackArg = oldFreeCallbackArg;
diff --git a/src/d/d_heap.cpp b/src/d/d_heap.cpp
index 2e9c3198..a29ba328 100644
--- a/src/d/d_heap.cpp
+++ b/src/d/d_heap.cpp
@@ -13,7 +13,7 @@ dHeap dHeap::HBMHeap;
 dHeapAllocator dHeapAllocator::sAllocator;
 
 extern u8 lbl_80571C58;
-extern "C" void fn_802de710();
+extern "C" void fn_802DE710();
 
 // TODO TU splits?
 
@@ -24,7 +24,7 @@ void dHeapAllocator::onAlloc(EGG::HeapAllocArg *arg) {
     if (lbl_80571C58 == 0) {
         return;
     }
-    fn_802de710();
+    fn_802DE710();
 }
 
 EGG::ExpHeap *dHeap::init(const char *name, size_t size, EGG::Heap *parent) {