diff --git a/polymer/eduke32/source/duke3d.h b/polymer/eduke32/source/duke3d.h
index 43379f41f..f89b4a918 100644
--- a/polymer/eduke32/source/duke3d.h
+++ b/polymer/eduke32/source/duke3d.h
@@ -428,12 +428,12 @@ typedef struct {
     short camerasprite,last_camsprite;
     short last_level,secretlevel;
 
+    char overhead_on,last_overhead,showweapons;
     char god,warp_on,cashman,eog,showallmap;
     char show_help,scrollmode,clipping;
     char ridecule[10][40];
     char savegame[10][22];
     char pwlockout[128],rtsname[128];
-    char overhead_on,last_overhead,showweapons;
 
 	config_t config;
 } user_defs;
diff --git a/polymer/eduke32/source/jaudiolib/_multivc.h b/polymer/eduke32/source/jaudiolib/_multivc.h
index bb8a8a33e..610a2f5df 100644
--- a/polymer/eduke32/source/jaudiolib/_multivc.h
+++ b/polymer/eduke32/source/jaudiolib/_multivc.h
@@ -97,13 +97,13 @@ typedef enum
     KeepPlaying
 } playbackstatus;
 
-typedef struct sounddef
-{
-        unsigned pos;
-        char *ptrsnd;
-        unsigned size;
-        OggVorbis_File  oggStream;
-} sounddef;
+typedef struct sounddef
+{
+        unsigned pos;
+        char *ptrsnd;
+        unsigned size;
+        OggVorbis_File  oggStream;
+} sounddef;
 
 typedef struct VoiceNode
 {
@@ -140,7 +140,7 @@ typedef struct VoiceNode
 
     void (*DemandFeed)(char **ptr, unsigned int *length);
 
-    struct       sounddef OGGstream;
+    sounddef OGGstream;
 //   char         *bufsnd;
     char         bufsnd[0x8000*4];
     int          downsample;
diff --git a/polymer/eduke32/source/jaudiolib/multivoc.c b/polymer/eduke32/source/jaudiolib/multivoc.c
index 98de9275f..2402ab317 100644
--- a/polymer/eduke32/source/jaudiolib/multivoc.c
+++ b/polymer/eduke32/source/jaudiolib/multivoc.c
@@ -1763,8 +1763,8 @@ size_t ReadOgg(void *ptr, size_t size1, size_t nmemb, void *datasource)
 {
     sounddef *d=(sounddef *)datasource;
     size1*=nmemb;
-    if (d->pos>=d->size)
-        return 0;
+/*    if (d->pos>=d->size)
+        return 0;*/
     if (d->pos+size1>=d->size)
         size1=d->size-d->pos;
     Bmemcpy(ptr,(d->ptrsnd+d->pos),size1);
@@ -1784,12 +1784,12 @@ int SeekOgg(void *datasource,ogg_int64_t offset,int whence)
         whence=d->pos+offset;
         break;
     case SEEK_END: 
-        whence=d->size-offset-1;
+        whence=d->size-offset;
         break;
     default: return -1;
     }
-    if (whence>=(int)d->size||whence<0)
-        return -1;
+/*    if (whence>=(int)d->size||whence<0)
+        return -1;*/
     d->pos=whence;
     return 0;
 }
@@ -2443,16 +2443,16 @@ int MV_PlayLoopedOGG(char *ptr, int loopstart, int loopend, int pitchoffset, int
         MV_SetErrorCode(MV_InvalidOGGFile);
         return(MV_Error);
     }
-
     while ((ogg_int64_t)(vorbisInfo->rate)/(1<<voice->downsample)*PITCH_GetScale(pitchoffset)/0x1000000/0x100)
         voice->downsample++;
     length=ov_pcm_total(&voice->OGGstream.oggStream,-1);
-//    if (!length)length=0xffffff;
-    if (length == OV_EINVAL)
+    if (!length)
+        length=0xffffff;
+/*    if (length == OV_EINVAL)
     {
         MV_SetErrorCode(MV_InvalidOGGFile);
         return(MV_Error);
-    }
+    }*/
 
     loopend=length=length>>voice->downsample;
 
diff --git a/polymer/eduke32/source/premap.c b/polymer/eduke32/source/premap.c
index bd1ce6668..0fd57ae24 100644
--- a/polymer/eduke32/source/premap.c
+++ b/polymer/eduke32/source/premap.c
@@ -401,7 +401,7 @@ void cacheit(void)
     if (ud.recstat == 2)
         return;
 
-    MUSIC_StopSong();
+//    MUSIC_StopSong();
     playmusicMAP(&env_music_fn[2][0],MAXVOLUMES*MAXLEVELS+2); // loadmus
 
     starttime = getticks();