diff --git a/src/k_kart.c b/src/k_kart.c
index 7401b9d4c..2b5d1ace9 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -8629,8 +8629,6 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 	boolean HOLDING_ITEM = (player->pflags & (PF_ITEMOUT|PF_EGGMANOUT));
 	boolean NO_HYUDORO = (player->stealingtimer == 0);
 
-	player->pflags &= ~PF_HITFINISHLINE;
-
 	if (!player->exiting)
 	{
 		if (player->oldposition < player->position) // But first, if you lost a place,
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 5a9f0925e..ad86d0434 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -4095,7 +4095,7 @@ boolean P_BossTargetPlayer(mobj_t *actor, boolean closest)
 
 		player = &players[actor->lastlook];
 
-		if (player->bot || player->spectator)
+		if (player->spectator)
 			continue; // ignore notarget
 
 		if (!player->mo || P_MobjWasRemoved(player->mo))
diff --git a/src/p_user.c b/src/p_user.c
index 5f5242e66..5af3386d6 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -4222,9 +4222,6 @@ void P_PlayerThink(player_t *player)
 	ticcmd_t *cmd;
 	const size_t playeri = (size_t)(player - players);
 
-	player->old_drawangle = player->drawangle;
-	player->old_viewrollangle = player->viewrollangle;
-
 #ifdef PARANOIA
 	if (!player->mo)
 		I_Error("p_playerthink: players[%s].mo == NULL", sizeu1(playeri));
@@ -4237,6 +4234,11 @@ void P_PlayerThink(player_t *player)
 		player->playerstate = PST_DEAD;
 	}
 
+	player->old_drawangle = player->drawangle;
+	player->old_viewrollangle = player->viewrollangle;
+
+	player->pflags &= ~PF_HITFINISHLINE;
+
 	if (player->awayviewmobj && P_MobjWasRemoved(player->awayviewmobj))
 	{
 		P_SetTarget(&player->awayviewmobj, NULL); // remove awayviewmobj asap if invalid
diff --git a/src/r_skins.c b/src/r_skins.c
index 1e80e18ce..ba7ed0811 100644
--- a/src/r_skins.c
+++ b/src/r_skins.c
@@ -311,11 +311,6 @@ void SetPlayerSkinByNum(INT32 playernum, INT32 skinnum)
 			}
 
 			player->skincolor = newcolor = skin->prefcolor;
-			if (player->bot && botingame)
-			{
-				botskin = (UINT8)(skinnum + 1);
-				botcolor = skin->prefcolor;
-			}
 		}
 #endif