diff --git a/src/k_collide.c b/src/k_collide.c
index 2894bdcdc..0472273d8 100644
--- a/src/k_collide.c
+++ b/src/k_collide.c
@@ -878,8 +878,8 @@ boolean K_SMKIceBlockCollide(mobj_t *t1, mobj_t *t2)
 
 boolean K_PvPTouchDamage(mobj_t *t1, mobj_t *t2)
 {
-	const boolean flameT1 = (t1->player->flamestore > 0 && t1->player->itemtype == KITEM_FLAMESHIELD);
-	const boolean flameT2 = (t2->player->flamestore > 0 && t2->player->itemtype == KITEM_FLAMESHIELD);
+	const boolean flameT1 = ((t1->player->flamestore > 0) && (t1->player->flametimer > 0));
+	const boolean flameT2 = ((t2->player->flamestore > 0) && (t2->player->flametimer > 0));
 
 	boolean t1Condition = false;
 	boolean t2Condition = false;
diff --git a/src/p_enemy.c b/src/p_enemy.c
index 8d1cf5d2b..ee66d6e76 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -3605,7 +3605,6 @@ void A_AttractChase(mobj_t *actor)
 			if (actor->extravalue1 >= 16)
 			{
 				if (!P_GivePlayerRings(actor->target->player, 1)) // returns 0 if addition failed
-				{
 					actor->target->player->ringboost += K_GetKartRingPower(actor->target->player, true) + 3;
 
 				if (actor->cvmem) // caching