diff --git a/src/k_kart.c b/src/k_kart.c
index e8cc80d7c..e4f3972bc 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -6425,7 +6425,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
 				ghost->extravalue1 = player->numboosts+1;
 				ghost->extravalue2 = (leveltime % ghost->extravalue1);
 				ghost->fuse = ghost->extravalue1;
-				ghost->frame |= FF_FULLBRIGHT;
+				ghost->renderflags |= RF_FULLBRIGHT;
 				ghost->colorized = true;
 				//ghost->color = player->skincolor;
 				//ghost->momx = (3*player->mo->momx)/4;
diff --git a/src/p_enemy.c b/src/p_enemy.c
index c9ba95245..9dbeb8f5b 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -11044,7 +11044,7 @@ void A_FadeOverlay(mobj_t *actor)
 		return;
 
 	fade = P_SpawnGhostMobj(actor);
-	fade->frame = actor->frame;
+	fade->renderflags = actor->renderflags;
 
 	if (!(locvar1 & 1))
 	{
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 1013d8521..1bc2c7761 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -8507,17 +8507,14 @@ void P_MobjThinker(mobj_t *mobj)
 				}
 			}
 		}
-		else if (mobj->flags2 & MF2_BOSSNOTRAP) // "fast" flag
-		{
-			if ((signed)((mobj->renderflags & RF_TRANSMASK) >> RF_TRANSSHIFT) < (NUMTRANSMAPS-1) - (2*mobj->fuse)/3)
-				// fade out when nearing the end of fuse...
-				mobj->renderflags = (mobj->renderflags & ~RF_TRANSMASK) | (((NUMTRANSMAPS-1) - (2*mobj->fuse)/3) << RF_TRANSSHIFT);
-		}
 		else
 		{
-			if ((signed)((mobj->renderflags & RF_TRANSMASK) >> RF_TRANSSHIFT) < (NUMTRANSMAPS-1) - mobj->fuse / 2)
+			INT32 dur = (mobj->flags2 & MF2_BOSSNOTRAP)
+				? (2*mobj->fuse)/3
+				: mobj->fuse/2;
+			if (((mobj->renderflags & RF_TRANSMASK) >> RF_TRANSSHIFT) < ((NUMTRANSMAPS-1) - dur))
 				// fade out when nearing the end of fuse...
-				mobj->renderflags = (mobj->frame & ~RF_TRANSMASK) | (((NUMTRANSMAPS-1) - mobj->fuse / 2) << RF_TRANSSHIFT);
+				mobj->renderflags = (mobj->renderflags & ~RF_TRANSMASK) | (((NUMTRANSMAPS-1) - dur) << RF_TRANSSHIFT);
 		}
 	}