diff --git a/source/src/clients2c.cpp b/source/src/clients2c.cpp
index 6ce45286..77e25eeb 100644
--- a/source/src/clients2c.cpp
+++ b/source/src/clients2c.cpp
@@ -679,6 +679,8 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
                 // cleanups
                 loopv(players) zapplayer(players[i]);
                 clearvote();
+                player1->state = CS_ALIVE;
+                player1->spectatemode = SM_NONE;
             }
             break;
         }
diff --git a/source/src/protos.h b/source/src/protos.h
index c1aaae3d..0f86a8af 100644
--- a/source/src/protos.h
+++ b/source/src/protos.h
@@ -495,7 +495,7 @@ extern void soundcleanup();
 extern void checkmapsounds();
 extern void checkplayerloopsounds();
 extern void musicsuggest(int id, int millis = 0, bool rndofs = false);
-extern void musicfadeout(int id);
+extern void musicfadeout(int id = -1);
 extern void clearsounds();
 extern void detachsounds(playerent *owner);
 
diff --git a/source/src/rendergl.cpp b/source/src/rendergl.cpp
index db69cf2f..1f41576a 100644
--- a/source/src/rendergl.cpp
+++ b/source/src/rendergl.cpp
@@ -676,7 +676,7 @@ void sethudgunperspective(bool on)
     if(on)
     {
         glScalef(1, 1, 0.5f); // fix hudugns colliding with map geometry
-        gluPerspective((float)100.0f*screen->h/screen->w, aspect, 0.3f, farplane); // fov fixed at 100°
+        gluPerspective((float)100.0f*screen->h/screen->w, aspect, 0.3f, farplane); // fov fixed at 100°
     }
     else gluPerspective((float)dynfov()*screen->h/screen->w, aspect, 0.15f, farplane);
     glMatrixMode(GL_MODELVIEW);
diff --git a/source/src/sound.cpp b/source/src/sound.cpp
index f2782021..ecb99ce5 100644
--- a/source/src/sound.cpp
+++ b/source/src/sound.cpp
@@ -734,6 +734,7 @@ void clearsounds()
     mapsounds.setsizenodelete(0);
     loopv(locations) locations[i].reset();
     locations.setsizenodelete(0);
+    gamemusic.reset();
     sourcesavail = true;
 }