diff --git a/src/machine.cpp b/src/machine.cpp
index e132c1d095..b807efb289 100644
--- a/src/machine.cpp
+++ b/src/machine.cpp
@@ -5182,11 +5182,11 @@ runFinalizeThread(Thread* t)
       }
     }
 
-    for (; finalizeList; finalizeList = finalizerQueueNext(t, finalizeList)) {
+    for (; finalizeList; finalizeList = reinterpret_cast<object>(finalizerQueueNext(t, finalizeList))) {
       finalizeObject(t, finalizerQueueTarget(t, finalizeList), "finalize");
     }
 
-    for (; cleanList; cleanList = cleanerQueueNext(t, cleanList)) {
+    for (; cleanList; cleanList = reinterpret_cast<object>(cleanerQueueNext(t, cleanList))) {
       finalizeObject(t, cleanList, "clean");
     }
   }
diff --git a/src/types.def b/src/types.def
index a28c0609a6..f61d7c2774 100644
--- a/src/types.def
+++ b/src/types.def
@@ -91,7 +91,7 @@
   (void* finalize)
   (nogc object next)
   (object queueTarget)
-  (object queueNext))
+  (finalizer queueNext))
 
 (type list
   (uint32_t size)
@@ -294,7 +294,7 @@
 (type phantomReference java/lang/ref/PhantomReference)
 
 (type cleaner sun/misc/Cleaner
-  (object queueNext))
+  (cleaner queueNext))
 
 (type byteArray [B
   (extends jobject)