diff --git a/polymer/build/src/engine.c b/polymer/build/src/engine.c
index 663594157..7764dec3a 100644
--- a/polymer/build/src/engine.c
+++ b/polymer/build/src/engine.c
@@ -38,7 +38,7 @@
 #define MAXTILEFILES 256
 #define MAXYSAVES ((MAXXDIM*MAXSPRITES)>>7)
 #define MAXNODESPERLINE 42   //Warning: This depends on MAXYSAVES & MAXYDIM!
-#define MAXWALLSB 2048
+#define MAXWALLSB ((MAXWALLS>>2)+(MAXWALLS>>3))
 #define MAXCLIPDIST 1024
 
 
diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c
index af5fd1811..ff9e7b159 100644
--- a/polymer/eduke32/source/astub.c
+++ b/polymer/eduke32/source/astub.c
@@ -2708,7 +2708,7 @@ static void Keys3d(void)
                 while (w >= 0)
                 {
                     j = nextspritesect[w];
-                    sprite[i].pal = pal;
+                    sprite[w].pal = pal;
                     w = j;
                 }
             }
diff --git a/polymer/eduke32/source/gamedef.c b/polymer/eduke32/source/gamedef.c
index 9a1955591..6ee1afe36 100644
--- a/polymer/eduke32/source/gamedef.c
+++ b/polymer/eduke32/source/gamedef.c
@@ -2381,7 +2381,6 @@ static int parsecommand(void)
         if (!CheckEventSync(current_event))
             ReportError(WARNING_EVENTSYNC);
     case CON_ANGOFF:
-    case CON_USERQUOTE:
     case CON_QUOTE:
     case CON_SOUND:
     case CON_GLOBALSOUND:
@@ -3044,6 +3043,7 @@ static int parsecommand(void)
     case CON_GUNIQHUDID:
     case CON_SAVEGAMEVAR:
     case CON_READGAMEVAR:
+    case CON_USERQUOTE:
         transvar();
         return 0;
 
diff --git a/polymer/eduke32/source/gameexec.c b/polymer/eduke32/source/gameexec.c
index 5b428da20..85aa7c1e2 100644
--- a/polymer/eduke32/source/gameexec.c
+++ b/polymer/eduke32/source/gameexec.c
@@ -6315,15 +6315,18 @@ static int parse(void)
 
     case CON_USERQUOTE:
         insptr++;
-        if (fta_quotes[*insptr] == NULL)
         {
-            OSD_Printf("%s %d null quote %d\n",__FILE__,__LINE__,*insptr);
-            insptr++;
-            break;
-        }
-        adduserquote(fta_quotes[*insptr++]);
-        break;
+            int i=GetGameVarID(*insptr++, g_i, g_p);
 
+            if (fta_quotes[i] == NULL)
+            {
+                OSD_Printf("%s %d null quote %d\n",__FILE__,__LINE__,i);
+                break;
+            }
+            adduserquote(fta_quotes[i]);
+        }
+        break;
+    
     case CON_IFINOUTERSPACE:
         parseifelse(floorspace(g_sp->sectnum));
         break;