diff --git a/polymer/build/src/build.c b/polymer/build/src/build.c
index ae030850b..06279976a 100644
--- a/polymer/build/src/build.c
+++ b/polymer/build/src/build.c
@@ -555,10 +555,10 @@ void editinput(void)
         osearchy = searchy;
         searchx += mousx;
         searchy += mousy;
-        if (searchx < 4) searchx = 4;
-        if (searchy < 4) searchy = 4;
-        if (searchx > xdim-5) searchx = xdim-5;
-        if (searchy > ydim-5) searchy = ydim-5;
+        if (searchx < 8) searchx = 8;
+        if (searchy < 8) searchy = 8;
+        if (searchx > xdim-9) searchx = xdim-9;
+        if (searchy > ydim-9) searchy = ydim-9;
     }
 
     showmouse();
diff --git a/polymer/eduke32/source/duke3d.h b/polymer/eduke32/source/duke3d.h
index ee2de4390..d33268095 100644
--- a/polymer/eduke32/source/duke3d.h
+++ b/polymer/eduke32/source/duke3d.h
@@ -126,7 +126,7 @@ enum gamemodes {
 };
 
 #define MAXANIMWALLS 512
-#define MAXINTERPOLATIONS 8192
+#define MAXINTERPOLATIONS MAXSPRITES
 
 #define MAXQUOTES 16384
 
diff --git a/polymer/eduke32/source/menus.c b/polymer/eduke32/source/menus.c
index 465cf0c2e..2aae0b5ea 100644
--- a/polymer/eduke32/source/menus.c
+++ b/polymer/eduke32/source/menus.c
@@ -4072,6 +4072,7 @@ VOLUME_ALL_40x:
                 else if(j == numplayers) {
                     Bmemset(votes,0,sizeof(votes));
                     Bmemset(gotvote,0,sizeof(gotvote));
+                    voting = -1;
 
                     tempbuf[0] = 18;
                     tempbuf[1] = 2;
@@ -4083,7 +4084,7 @@ VOLUME_ALL_40x:
                         if(c != myconnectindex) sendpacket(c,tempbuf,4);
                         if ((!networkmode) && (myconnectindex != connecthead)) break; //slaves in M/S mode only send to master
                     }
-                    voting = -1;
+
                     Bsprintf(fta_quotes[116],"VOTE FAILED");
                     FTA(116,&ps[myconnectindex]);
                     ps[myconnectindex].gm &= ~MODE_MENU;