diff --git a/interop/src/cpp/ani/convertors-ani.h b/interop/src/cpp/ani/convertors-ani.h
index 6ca8e43d990c62afc5b239db7ec577c4c4216754..c6aaaf46c992f103244d96a99a32a44e05453895 100644
--- a/interop/src/cpp/ani/convertors-ani.h
+++ b/interop/src/cpp/ani/convertors-ani.h
@@ -1367,11 +1367,11 @@ void getKoalaEtsNapiCallbackDispatcher(ani_class* clazz, ani_method* method);
 #else
 
 #define KOALA_INTEROP_CALL_VOID(venv, id, length, args)
-#define KOALA_INTEROP_CALL_INT(venv, id, length, args)
-#define KOALA_INTEROP_CALL_VOID_INTS32(venv, id, argc, args)
-#define KOALA_INTEROP_CALL_INT_INTS32(venv, id, argc, args)
-#define KOALA_INTEROP_THROW(vmContext, object, ...)
-#define KOALA_INTEROP_THROW_STRING(vmContext, message, ...)
+#define KOALA_INTEROP_CALL_INT(venv, id, length, args) { return 0; }
+#define KOALA_INTEROP_CALL_VOID_INTS32(venv, id, argc, args) { return; }
+#define KOALA_INTEROP_CALL_INT_INTS32(venv, id, argc, args) { return 0; }
+#define KOALA_INTEROP_THROW(vmContext, object, ...) { return __VA_ARGS__; }
+#define KOALA_INTEROP_THROW_STRING(vmContext, message, ...) { return __VA_ARGS__; }
 #endif
 
 #endif // KOALA_ETS_NAPI
diff --git a/interop/src/cpp/common-interop.cc b/interop/src/cpp/common-interop.cc
index cd3146017a72ae26c0003daf542ef9ad802386be..f7f5b74a6196f0e029b4b70a37b20ae0d8580e51 100644
--- a/interop/src/cpp/common-interop.cc
+++ b/interop/src/cpp/common-interop.cc
@@ -310,7 +310,7 @@ KBoolean impl_RunApplication(const KInt arg0, const KInt arg1) {
 }
 KOALA_INTEROP_2(RunApplication, KBoolean, KInt, KInt)
 
-KStringPtr impl_EmitEvent(const KInt type, const KInt target, const KInt arg0, const KInt arg1) {
+KStringPtr impl_EmitEvent(KVMContext vmContext, KInt type, KInt target, KInt arg0, KInt arg1) {
     static EmitEvent_t impl = nullptr;
     if (!impl) impl = reinterpret_cast<EmitEvent_t>(getImpl(nullptr, "EmitEvent"));
     const char* out = impl(type, target, arg0, arg1);
@@ -318,7 +318,7 @@ KStringPtr impl_EmitEvent(const KInt type, const KInt target, const KInt arg0, c
     KStringPtr result(out, size, true);
     return result;
 }
-KOALA_INTEROP_4(EmitEvent,KStringPtr, KInt, KInt, KInt, KInt)
+KOALA_INTEROP_CTX_4(EmitEvent, KStringPtr, KInt, KInt, KInt, KInt)
 
 void impl_RestartWith(const KStringPtr& page) {
     static RestartWith_t impl = nullptr;