diff --git a/polymer/build/src/engine.c b/polymer/build/src/engine.c
index cbe4bfc0d..113e132f7 100644
--- a/polymer/build/src/engine.c
+++ b/polymer/build/src/engine.c
@@ -7649,7 +7649,8 @@ int saveboard(char *filename, int *daposx, int *daposy, int *daposz,
         Bwrite(fil,&tsect[0],sizeof(sectortype) * numsectors);
         Bfree(tsect);
 
-        ts = B_LITTLE16(numwalls);      Bwrite(fil,&ts,2);
+        ts = B_LITTLE16(numwalls);
+        Bwrite(fil,&ts,2);
 
         twall = (walltype *)Bmalloc(sizeof(walltype) * numwalls);
 
@@ -7687,7 +7688,7 @@ int saveboard(char *filename, int *daposx, int *daposy, int *daposz,
 
         spri=tspri;
 
-        for (j=0;j<MAXSPRITES;j++)
+        for (j=0;j<numsprites;j++)
         {
             if (sprite[j].statnum != MAXSTATUS)
             {
diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c
index 027e553c3..db5ed27a4 100644
--- a/polymer/eduke32/source/astub.c
+++ b/polymer/eduke32/source/astub.c
@@ -2624,6 +2624,9 @@ static void Keys3d(void)
             {
                 if (wall[i].picnum == temppicnum) count++;
                 if (wall[i].overpicnum == temppicnum) count++;
+            }
+            for (i=0;i<numsectors;i++)
+            {
                 if (sector[i].ceilingpicnum == temppicnum) count++;
                 if (sector[i].floorpicnum == temppicnum) count++;
             }
diff --git a/polymer/eduke32/source/gameexec.c b/polymer/eduke32/source/gameexec.c
index 9ce199edb..22343287c 100644
--- a/polymer/eduke32/source/gameexec.c
+++ b/polymer/eduke32/source/gameexec.c
@@ -6678,14 +6678,15 @@ static int parse(void)
             // syntax [gs]etactorvar[<var>].<varx> <VAR>
             // gets the value of the per-actor variable varx into VAR
             // <var> <varx> <VAR>
-            int lSprite=GetGameVarID(*insptr++, g_i, g_p), lVar1=*insptr++, lVar2=*insptr++;
+            int lSprite=GetGameVarID(*insptr++, g_i, g_p), lVar1=*insptr++;
+            j=*insptr++;
 
             if (tw == CON_SETACTORVAR)
             {
-                SetGameVarID(lVar1, GetGameVarID(lVar2, g_i, g_p), lSprite, g_p);
+                SetGameVarID(lVar1, GetGameVarID(j, g_i, g_p), lSprite, g_p);
                 break;
             }
-            SetGameVarID(lVar2, GetGameVarID(lVar1, lSprite, g_p), g_i, g_p);
+            SetGameVarID(j, GetGameVarID(lVar1, lSprite, g_p), g_i, g_p);
             break;
         }