diff --git a/polymer/eduke32/build/include/m32script.h b/polymer/eduke32/build/include/m32script.h
index 0050c5514..44d170de4 100644
--- a/polymer/eduke32/build/include/m32script.h
+++ b/polymer/eduke32/build/include/m32script.h
@@ -191,7 +191,7 @@ extern vec3_t pos;
 extern int16_t ang;
 extern int32_t horiz;
 extern int16_t cursectnum;
-extern int32_t searchx;
+extern int32_t searchx, searchy;
 /*
 extern int16_t searchstat;
 extern int16_t searchwall;
diff --git a/polymer/eduke32/source/m32def.c b/polymer/eduke32/source/m32def.c
index 27e34c0fe..8621fc6f2 100644
--- a/polymer/eduke32/source/m32def.c
+++ b/polymer/eduke32/source/m32def.c
@@ -3087,6 +3087,7 @@ static void C_AddDefaultDefinitions(void)
     C_AddDefinition("MAXSECTORS", MAXSECTORS, LABEL_DEFINE);
     C_AddDefinition("MAXWALLS", MAXWALLS, LABEL_DEFINE);
     C_AddDefinition("MAXTILES", MAXTILES, LABEL_DEFINE);
+    C_AddDefinition("MAXSTATUS", MAXSTATUS, LABEL_DEFINE);
 
 // keys
     C_AddDefinition("KEY_SPACE", KEYSC_SPACE, LABEL_DEFINE);
diff --git a/polymer/eduke32/source/m32exec.c b/polymer/eduke32/source/m32exec.c
index 9df3cecda..d5669b3b0 100644
--- a/polymer/eduke32/source/m32exec.c
+++ b/polymer/eduke32/source/m32exec.c
@@ -1536,7 +1536,7 @@ badindex:
 
                 X_ERROR_INVALIDSPRI(daspritenum);
                 ret = deletesprite(daspritenum);
-                Gv_SetVarX(g_iReturnVarID, ret);
+                g_iReturnVar = ret;
                 if (ret==0)
                     numsprites--;
             }
diff --git a/polymer/eduke32/source/m32vars.c b/polymer/eduke32/source/m32vars.c
index 0d75dbcd5..da594f007 100644
--- a/polymer/eduke32/source/m32vars.c
+++ b/polymer/eduke32/source/m32vars.c
@@ -558,7 +558,7 @@ static void Gv_AddSystemVars(void)
     Gv_NewVar("cursectnum",(intptr_t)&cursectnum, GAMEVAR_READONLY | GAMEVAR_SHORTPTR | GAMEVAR_SYSTEM);
 
     Gv_NewVar("searchx",(intptr_t)&searchx, GAMEVAR_READONLY | GAMEVAR_INTPTR | GAMEVAR_SYSTEM);
-    Gv_NewVar("searchy",(intptr_t)&searchx, GAMEVAR_READONLY | GAMEVAR_INTPTR | GAMEVAR_SYSTEM);
+    Gv_NewVar("searchy",(intptr_t)&searchy, GAMEVAR_READONLY | GAMEVAR_INTPTR | GAMEVAR_SYSTEM);
     Gv_NewVar("searchstat",(intptr_t)&searchstat, GAMEVAR_READONLY | GAMEVAR_SHORTPTR | GAMEVAR_SYSTEM);
     Gv_NewVar("searchwall",(intptr_t)&searchwall, GAMEVAR_READONLY | GAMEVAR_SHORTPTR | GAMEVAR_SYSTEM);
     Gv_NewVar("searchsector",(intptr_t)&searchsector, GAMEVAR_READONLY | GAMEVAR_SHORTPTR | GAMEVAR_SYSTEM);