diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c
index 8bb4c959..119ff273 100644
--- a/src/hardware/hw_md2.c
+++ b/src/hardware/hw_md2.c
@@ -1208,7 +1208,7 @@ static void HWR_CreateBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch,
 	}
 
 	// starman support, could theoretically support boss ones too
-	if (skinnum == TC_STARMAN)
+	if (skinnum == TC_RAINBOW)
 	{
 		while (size--)
 		{
@@ -1490,7 +1490,7 @@ void HWR_DrawMD2(gr_vissprite_t *spr)
 					if (spr->mobj->skin && spr->mobj->sprite == SPR_PLAY)
 					{
 						if (spr->mobj->colorized)
-							skinnum = TC_STARMAN;
+							skinnum = TC_RAINBOW;
 						else
 						{
 							skinnum = (INT32)((skin_t*)spr->mobj->skin-skins);
diff --git a/src/info.c b/src/info.c
index 83b788a4..932a2ee2 100644
--- a/src/info.c
+++ b/src/info.c
@@ -2688,7 +2688,7 @@ state_t states[NUMSTATES] =
 	{SPR_SSMN,  3,  3, {A_GrenadeRing}, 0, 0, S_BOMBITEM3},			// S_BOMBITEM2
 	{SPR_SSMN,  2,  3, {A_GrenadeRing}, 0, 0, S_BOMBITEM4},			// S_BOMBITEM3
 	{SPR_SSMN,  1,  3, {A_GrenadeRing}, 0, 0, S_BOMBITEM1},			// S_BOMBITEM4
-	{SPR_BOMB,  0,  1, {A_MineExplode}, MT_BOMBEXPLOSION, 0, S_NULL},	// S_BOMBEXPLODE
+	{SPR_MINE,  3,  1, {A_MineExplode}, MT_BOMBEXPLOSION, 0, S_NULL},	// S_BOMBEXPLODE
 	{SPR_NULL,  0,  6, {NULL}, 0, 0, S_BOMBEXPLOSION2},				// S_BOMBEXPLOSION1
 	{SPR_NULL,  1, 22, {A_ForceStop}, 0, 0, S_NULL},					// S_BOMBEXPLOSION2
 
diff --git a/src/k_kart.c b/src/k_kart.c
index 9a36c8f2..873cca00 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -1230,7 +1230,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
 
 void K_KartPlayerAfterThink(player_t *player)
 {
-	if (player->kartstuff[k_startimer])
+	if (player->kartstuff[k_invincibilitytimer])
 	{
 		player->mo->frame |= FF_FULLBRIGHT;
 	}
@@ -1765,7 +1765,7 @@ void K_SpawnKartExplosion(fixed_t x, fixed_t y, fixed_t z, fixed_t radius, INT32
 }
 
 // Spawns the purely visual explosion
-void K_SpawnBobombExplosion(mobj_t *source)
+void K_SpawnMineExplosion(mobj_t *source)
 {
 	INT32 i, radius, height;
 	mobj_t *smoldering = P_SpawnMobj(source->x, source->y, source->z, MT_SMOLDERING);
diff --git a/src/k_kart.h b/src/k_kart.h
index b5df29da..80cc455a 100644
--- a/src/k_kart.h
+++ b/src/k_kart.h
@@ -27,7 +27,7 @@ void K_SquishPlayer(player_t *player, mobj_t *source);
 void K_ExplodePlayer(player_t *player, mobj_t *source);
 void K_StealBalloon(player_t *player, player_t *victim, boolean force);
 void K_SpawnKartExplosion(fixed_t x, fixed_t y, fixed_t z, fixed_t radius, INT32 number, mobjtype_t type, angle_t rotangle, boolean spawncenter, boolean ghostit, mobj_t *source);
-void K_SpawnBobombExplosion(mobj_t *source);
+void K_SpawnMineExplosion(mobj_t *source);
 void K_SpawnDriftTrail(player_t *player);
 void K_DoSneaker(player_t *player, boolean doPFlag, boolean startboost);
 void K_DoBouncePad(mobj_t *mo, fixed_t vertispeed);
diff --git a/src/p_enemy.c b/src/p_enemy.c
index 5786448e..67e36571 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -8272,7 +8272,7 @@ void A_MineExplode(mobj_t *actor)
 	for (d = 0; d < 16; d++)
 		K_SpawnKartExplosion(actor->x, actor->y, actor->z, actor->info->painchance + 32*FRACUNIT, 32, type, d*(ANGLE_45/4), true, false, actor->target); // 32 <-> 64
 
-	K_SpawnBobombExplosion(actor);
+	K_SpawnMineExplosion(actor);
 
 	P_SpawnMobj(actor->x, actor->y, actor->z, MT_BOMBEXPLOSIONSOUND);