diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index 8580564f8..6f59058f1 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -889,7 +889,7 @@ void Net_SyncPlayer(ENetEvent * event)
     // no slots empty from players quitting, so open a new one
     if (i == -1)
         i = playerswhenstarted++;
-    event->peer->data = (void *)i;
+    event->peer->data = (void *) ((intptr_t) i);
 
     clearbufbyte(&g_player[i].playerquitflag,1,0x01010101);
     g_player[i].movefifoend = 1;
diff --git a/polymer/eduke32/source/gamedef.c b/polymer/eduke32/source/gamedef.c
index 28df1c5d6..86fb3fce7 100644
--- a/polymer/eduke32/source/gamedef.c
+++ b/polymer/eduke32/source/gamedef.c
@@ -1227,7 +1227,7 @@ static int32_t C_SkipComments(void)
                         initprintf("%s:%d: debug: EOF in comment!\n",g_szScriptFileName,g_lineNumber);
                     C_ReportError(-1);
                     initprintf("%s:%d: error: found `/*' with no `*/'.\n",g_szScriptFileName,g_lineNumber);
-                    g_parsingActorPtr = (intptr_t *)(g_processingState = g_numBraces = 0);
+                    g_parsingActorPtr = 0;g_processingState = g_numBraces = 0;
                     g_numCompilerErrors++;
                     break;
                 }
diff --git a/polymer/eduke32/source/sounds.c b/polymer/eduke32/source/sounds.c
index d14c29c64..bfba78474 100644
--- a/polymer/eduke32/source/sounds.c
+++ b/polymer/eduke32/source/sounds.c
@@ -289,13 +289,13 @@ int32_t S_PlayMusic(const char *fn, const int32_t sel)
     char *ofn = (char *)fn;
     int32_t fp;
     char * testfn, * extension;
-    int32_t alt = 0;
+    const char* alt = 0;
 
     if (ud.config.MusicToggle == 0) return 0;
     if (ud.config.MusicDevice < 0) return 0;
 
     if (MapInfo[sel].alt_musicfn != NULL)
-        alt = (int32_t)(fn = MapInfo[sel].alt_musicfn);
+        alt = fn = MapInfo[sel].alt_musicfn;
 
 
     testfn = (char *) Bmalloc(strlen(fn) + 5);