diff --git a/src/g_shared/a_morph.cpp b/src/g_shared/a_morph.cpp
index 174bfd4a20..3b3741a43a 100644
--- a/src/g_shared/a_morph.cpp
+++ b/src/g_shared/a_morph.cpp
@@ -91,6 +91,8 @@ bool P_MorphPlayer (player_t *activator, player_t *p, PClassPlayerPawn *spawntyp
 	morphed->Angles.Yaw = actor->Angles.Yaw;
 	morphed->target = actor->target;
 	morphed->tracer = actor;
+	morphed->FriendPlayer = actor->FriendPlayer;
+	morphed->DesignatedTeam = actor->DesignatedTeam;
 	morphed->Score = actor->Score;
 	p->PremorphWeapon = p->ReadyWeapon;
 	morphed->special2 = actor->flags & ~MF_JUSTHIT;
diff --git a/src/menu/optionmenuitems.h b/src/menu/optionmenuitems.h
index 0f315d5f62..f810f788bb 100644
--- a/src/menu/optionmenuitems.h
+++ b/src/menu/optionmenuitems.h
@@ -122,7 +122,20 @@ public:
 	bool Activate()
 	{
 		const char *msg = GStrings("SAFEMESSAGE");
-		if (msg) M_StartMessage(msg, 0);
+
+		const char *actionLabel = mLabel;
+		if (actionLabel != NULL)
+		{
+			if (*actionLabel == '$')
+			{
+				actionLabel = GStrings(actionLabel + 1);
+			}
+		}
+
+		FString FullString;
+		FullString.Format(TEXTCOLOR_WHITE "%s" TEXTCOLOR_NORMAL "\n\n" "%s", actionLabel != NULL ? actionLabel : "", msg);
+
+		if (msg && FullString) M_StartMessage(FullString, 0);
 		return true;
 	}
 };
diff --git a/src/p_sight.cpp b/src/p_sight.cpp
index 469cc87833..f9a0d03d5b 100644
--- a/src/p_sight.cpp
+++ b/src/p_sight.cpp
@@ -114,7 +114,7 @@ public:
 	{
 		sightstart = t1->PosRelative(task->portalgroup);
 		sightend = t2->PosRelative(task->portalgroup);
-		sightstart.Z += t1->Height / 2;
+		sightstart.Z += t1->Height * 0.75;
 
 		Startfrac = task->Frac;
 		Trace = { sightstart.X, sightstart.Y, sightend.X - sightstart.X, sightend.Y - sightstart.Y };