diff --git a/compiler/src/prog8/compiler/astprocessing/IntermediateAstPostprocess.kt b/compiler/src/prog8/compiler/astprocessing/IntermediateAstPostprocess.kt
index d943b1810..9501254bb 100644
--- a/compiler/src/prog8/compiler/astprocessing/IntermediateAstPostprocess.kt
+++ b/compiler/src/prog8/compiler/astprocessing/IntermediateAstPostprocess.kt
@@ -144,7 +144,7 @@ private fun integrateDefers(subdefers: Map<PtSub, List<PtDefer>>, program: PtPro
         newRet.add(popCall)
         val group = PtNodeGroup()
         group.add(pushCall)
-        group.add(PtBuiltinFunctionCall(invokeDefersRoutineName, true, false, DataType.UNDEFINED, ret.position))
+        group.add(PtFunctionCall(ret.definingSub()!!.scopedName+"."+invokeDefersRoutineName, true, DataType.UNDEFINED, ret.position))
         group.add(newRet)
         group.parent = ret.parent
         val idx = ret.parent.children.indexOf(ret)
@@ -158,7 +158,7 @@ private fun integrateDefers(subdefers: Map<PtSub, List<PtDefer>>, program: PtPro
             val idx = sub.children.indexOfLast { it !is PtDefer }
             val ret = PtReturn(sub.position)
             sub.add(idx+1, ret)
-            val invokedefer = PtBuiltinFunctionCall(invokeDefersRoutineName, true, false, DataType.UNDEFINED, sub.position)
+            val invokedefer = PtFunctionCall(sub.scopedName+"."+invokeDefersRoutineName, true, DataType.UNDEFINED, sub.position)
             sub.add(idx+1, invokedefer)
         }
     }
diff --git a/compiler/src/prog8/compiler/astprocessing/Utility.kt b/compiler/src/prog8/compiler/astprocessing/Utility.kt
index e222ac98c..31ce47048 100644
--- a/compiler/src/prog8/compiler/astprocessing/Utility.kt
+++ b/compiler/src/prog8/compiler/astprocessing/Utility.kt
@@ -36,7 +36,7 @@ internal fun makePushPopFunctionCalls(value: PtExpression): Pair<PtFunctionCall,
 
     val pushFunc = if(pushFloat) "floats.push" else if(pushWord) "sys.pushw" else "sys.push"
     val popFunc = if(pushFloat) "floats.pop" else if(pushWord) "sys.popw" else "sys.pop"
-    val pushCall = PtFunctionCall(pushFunc, true, value.type, value.position)
+    val pushCall = PtFunctionCall(pushFunc, true, DataType.UNDEFINED, value.position)
     if(pushTypecast!=null) {
         val typecast = PtTypeCast(pushTypecast, value.position).also {
             it.add(value)