diff --git a/src/gs-entbase/shared/baseentity.qc b/src/gs-entbase/shared/baseentity.qc
index e9d6a5bd..ab1b227c 100644
--- a/src/gs-entbase/shared/baseentity.qc
+++ b/src/gs-entbase/shared/baseentity.qc
@@ -473,6 +473,9 @@ CBaseEntity::SendEntity(entity ePEnt, float fChanged)
 		WriteCoord(MSG_ENTITY, origin[2]);
 	}
 	if (fChanged & BASEFL_CHANGED_ANGLES) {
+		angles[0] = Math_FixDelta(angles[0]);
+		angles[1] = Math_FixDelta(angles[1]);
+		angles[2] = Math_FixDelta(angles[2]);
 		WriteShort(MSG_ENTITY, angles[0] * (65535/360));
 		WriteShort(MSG_ENTITY, angles[1] * (65535/360));
 		WriteShort(MSG_ENTITY, angles[2] * (65535/360));
diff --git a/src/server/entry.qc b/src/server/entry.qc
index 3ab08ed3..2c0fc9f9 100644
--- a/src/server/entry.qc
+++ b/src/server/entry.qc
@@ -752,5 +752,5 @@ CheckSpawn(void() spawnfunc)
 	if (spawnfunc)
 		spawnfunc();
 	else
-		remove();
+		remove(self);
 }
diff --git a/src/shared/player_pmove.qc b/src/shared/player_pmove.qc
index 93dcd13b..62c6304a 100644
--- a/src/shared/player_pmove.qc
+++ b/src/shared/player_pmove.qc
@@ -317,4 +317,8 @@ base_player::Physics_Run(void)
 	}
 
 	Physics_InputPostMove();
+
+	angles[0] = Math_FixDelta(angles[0]);
+	angles[1] = Math_FixDelta(angles[1]);
+	angles[2] = Math_FixDelta(angles[2]);
 }