diff --git a/polymer/build/src/cache1d.c b/polymer/build/src/cache1d.c
index 181173053..00a557a43 100644
--- a/polymer/build/src/cache1d.c
+++ b/polymer/build/src/cache1d.c
@@ -399,7 +399,7 @@ BFILE* fopenfrompath(const char *fn, const char *mode)
 }
 
 
-#define MAXGROUPFILES 4     //Warning: Fix groupfil if this is changed
+#define MAXGROUPFILES 8     //Warning: Fix groupfil if this is changed
 #define MAXOPENFILES 64     //Warning: Fix filehan if this is changed
 
 static char toupperlookup[256] =
@@ -424,7 +424,7 @@ static char toupperlookup[256] =
 
 static int numgroupfiles = 0;
 static int gnumfiles[MAXGROUPFILES];
-static int groupfil[MAXGROUPFILES] = {-1,-1,-1,-1};
+static int groupfil[MAXGROUPFILES] = {-1,-1,-1,-1,-1,-1,-1,-1};
 static int groupfilpos[MAXGROUPFILES];
 static char *gfilelist[MAXGROUPFILES];
 static int *gfileoffs[MAXGROUPFILES];
diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c
index ae75729b6..406d40e9e 100644
--- a/polymer/eduke32/source/astub.c
+++ b/polymer/eduke32/source/astub.c
@@ -10618,4 +10618,6 @@ typedef struct _mapundo
 
 mapundo_t *undopos = NULL;
 mapundo_t undoredo[UNDODEPTH];
+
+int map_revision = 0;
 */
diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index 211896eed..579cca761 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -10928,7 +10928,7 @@ void app_main(int argc,const char **argv)
     {
         Bstrcat(root,mod_dir);
         addsearchpath(root);
-        addsearchpath(mod_dir);
+//        addsearchpath(mod_dir);
 #if defined(POLYMOST) && defined(USE_OPENGL)
         Bsprintf(tempbuf,"%s/%s",mod_dir,TEXCACHEDIR);
         Bstrcpy(TEXCACHEDIR,tempbuf);
@@ -11084,6 +11084,14 @@ void app_main(int argc,const char **argv)
 
     ud.last_level = -1;
 
+    if (Bstrcasecmp(ud.rtsname,"DUKE.RTS") == 0)
+    {
+        if (WW2GI)
+            Bstrcpy(ud.rtsname, "WW2GI.RTS");
+        else if (NAM)
+            Bstrcpy(ud.rtsname, "NAM.RTS");
+    }
+
     RTS_Init(ud.rtsname);
     if (numlumps) initprintf("Using .RTS file '%s'\n",ud.rtsname);