diff --git a/polymer/build/include/build.h b/polymer/build/include/build.h
index 9f8639f4a..cb7ada6ad 100644
--- a/polymer/build/include/build.h
+++ b/polymer/build/include/build.h
@@ -33,7 +33,7 @@ extern "C" {
 #define MAXYDIM 1200
 #define MAXPALOOKUPS 256
 #define MAXPSKYTILES 256
-#define MAXSPRITESONSCREEN 2048
+#define MAXSPRITESONSCREEN 4096
 #define MAXUNIQHUDID 256 //Extra slots so HUD models can store animation state without messing game sprites
 
 #define CLIPMASK0 (((1L)<<16)+1L)
diff --git a/polymer/build/src/polymost.c b/polymer/build/src/polymost.c
index eab03f757..409b04223 100644
--- a/polymer/build/src/polymost.c
+++ b/polymer/build/src/polymost.c
@@ -688,7 +688,7 @@ void polymost_glinit()
 
     if (!glinfo.arbfp || !glinfo.depthtex || !glinfo.shadow || !glinfo.fbos || !glinfo.rect)
     {
-        OSD_Printf("Your OpenGL implementation doesn't support depth peeling. Forcing it off...\n", i);
+        OSD_Printf("Your OpenGL implementation doesn't support depth peeling.  Disabling...\n");
         r_depthpeeling = 0;
     }
 
@@ -5128,6 +5128,12 @@ static int osdcmd_polymostvars(const osdfuncparm_t *parm)
     else if (!Bstrcasecmp(parm->name, "r_depthpeeling")) {
         if (showval) { OSD_Printf("r_depthpeeling is %d\n", r_depthpeeling); }
         else {
+            if (!glinfo.arbfp || !glinfo.depthtex || !glinfo.shadow || !glinfo.fbos || !glinfo.rect)
+            {
+                OSD_Printf("r_depthpeeling: Your OpenGL implementation doesn't support depth peeling.\n");
+                r_depthpeeling = 0;
+                return OSDCMD_OK;
+            }
             r_depthpeeling = (val != 0);
             resetvideomode();
             if (setgamemode(fullscreen,xdim,ydim,bpp))
diff --git a/polymer/eduke32/Makefile.deps b/polymer/eduke32/Makefile.deps
index ac5a0f39b..b8bc7064a 100644
--- a/polymer/eduke32/Makefile.deps
+++ b/polymer/eduke32/Makefile.deps
@@ -58,7 +58,7 @@ $(OBJ)/pitch.$o: $(SRC)/jaudiolib/pitch.c $(SRC)/jaudiolib/pitch.h
 $(OBJ)/multivoc.$o: $(SRC)/jaudiolib/multivoc.c $(SRC)/jaudiolib/usrhooks.h $(SRC)/jaudiolib/linklist.h $(SRC)/jaudiolib/pitch.h $(SRC)/jaudiolib/multivoc.h $(SRC)/jaudiolib/_multivc.h
 $(OBJ)/fx_man.$o: $(SRC)/jaudiolib/fx_man.c $(SRC)/jaudiolib/multivoc.h $(SRC)/jaudiolib/ll_man.h $(SRC)/jaudiolib/fx_man.h
 $(OBJ)/dsoundout.$o: $(SRC)/jaudiolib/dsoundout.c $(SRC)/jaudiolib/dsoundout.h
-$(OBJ)/dsl.$o: $(SRC)/jaudiolib/dsl.c $(EINC)/compat.h
+$(OBJ)/dsl.$o: $(SRC)/jaudiolib/dsl.c $(SRC)/jaudiolib/dsl.h $(EINC)/compat.h
 
 $(OBJ)/midi.$o: $(SRC)/jaudiolib/midi.c $(SRC)/jaudiolib/standard.h $(SRC)/jaudiolib/usrhooks.h $(SRC)/jaudiolib/music.h $(SRC)/jaudiolib/_midi.h $(SRC)/jaudiolib/midi.h
 $(OBJ)/mpu401.$o: $(SRC)/jaudiolib/mpu401.c $(SRC)/jaudiolib/mpu401.h
diff --git a/polymer/eduke32/source/jaudiolib/dsl.h b/polymer/eduke32/source/jaudiolib/dsl.h
index cb0e29985..5db180d96 100755
--- a/polymer/eduke32/source/jaudiolib/dsl.h
+++ b/polymer/eduke32/source/jaudiolib/dsl.h
@@ -26,7 +26,6 @@ Adapted to work with JonoF's port by James Bentler (bentler@cs.umn.edu)
 #define MONO_8BIT    0
 #define STEREO      1
 #define SIXTEEN_BIT 2
-#define STEREO_16BIT ( STEREO | SIXTEEN_BIT )
 
 enum DSL_ERRORS
    {
diff --git a/polymer/eduke32/source/rts.c b/polymer/eduke32/source/rts.c
index 24900d21e..7427bc80c 100644
--- a/polymer/eduke32/source/rts.c
+++ b/polymer/eduke32/source/rts.c
@@ -71,7 +71,7 @@ int32 RTS_AddFile(const char *filename)
     // read the entire file in
     //      FIXME: shared opens
 
-    handle = kopen4load(filename, 0);
+    handle = kopen4load((char *)filename, 0);
     if (handle < 0)
     {
         initprintf("RTS file %s was not found\n",filename);