diff --git a/source/src/physics.cpp b/source/src/physics.cpp
index f558f285..b6067c15 100644
--- a/source/src/physics.cpp
+++ b/source/src/physics.cpp
@@ -639,7 +639,7 @@ void mousemove(int dx, int dy)
     camera1->yaw += (dx/SENSF)*(sensitivity/(float)sensitivityscale);
     camera1->pitch -= (dy/SENSF)*(sensitivity/(float)sensitivityscale)*(invmouse ? -1 : 1);
     fixcamerarange();
-    if(camera1!=player1)
+    if(camera1!=player1 && player1->spectatemode!=SM_DEATHCAM)
     {
         player1->yaw = camera1->yaw;
         player1->pitch = camera1->pitch;
diff --git a/source/src/rendergl.cpp b/source/src/rendergl.cpp
index b2e28c45..18ff3f26 100644
--- a/source/src/rendergl.cpp
+++ b/source/src/rendergl.cpp
@@ -421,7 +421,7 @@ void recomputecamera()
                 static playerent *lastplayer;
                 if(lastplayer != p || &followcam != camera1)
                 {
-                    followcam = *(playerent*)p;
+                    followcam = *(physent *)p;
                     followcam.type = ENT_CAMERA;
                     followcam.reset();
                     followcam.roll = 0;