diff --git a/src/gs-entbase/client/point_message.qc b/src/gs-entbase/client/point_message.qc
index b9342a87..36cdbbdf 100644
--- a/src/gs-entbase/client/point_message.qc
+++ b/src/gs-entbase/client/point_message.qc
@@ -77,7 +77,7 @@ PointMessage_Visible(vector p1, vector p2, vector ang)
 	fov = delta * v_forward;
 
 	if (fov > 0.3) {
-		traceline(p2, p1, TRUE, self);
+		traceline(p2, p1, MOVE_WORLDONLY, self);
 		if (trace_fraction == 1.0) {
 			return (1);
 		}
diff --git a/src/server/gamerules.qc b/src/server/gamerules.qc
index 9094b8f7..dc208375 100644
--- a/src/server/gamerules.qc
+++ b/src/server/gamerules.qc
@@ -214,6 +214,7 @@ CGameRules::DamageApply(entity t, entity c, float dmg, int w, damageType_t type)
 
 	/* friendly fire */
 	if (autocvar_sv_friendlyFire == false)
+	if (t != c)
 	if (IsTeamPlay()) {
 		if (t.flags & FL_CLIENT && c.flags & FL_CLIENT)
 			if (t.team == c.team)
diff --git a/src/shared/spectator.qc b/src/shared/spectator.qc
index 37d67c0e..d8471ace 100644
--- a/src/shared/spectator.qc
+++ b/src/shared/spectator.qc
@@ -365,7 +365,7 @@ spectator::SpectatorTrackPlayer(void)
 
 		if (b && b.classname == "player")
 		if (b.IsFakeSpectator()) {
-			b = world;
+			b = 0;
 			spec_mode = SPECMODE_FREE;
 			InputNext();
 		}