diff --git a/src/info/mobjs.h b/src/info/mobjs.h
index 0783cd339..6d1939ea0 100644
--- a/src/info/mobjs.h
+++ b/src/info/mobjs.h
@@ -479,10 +479,8 @@ _(GOOMBA)
 _(BLUEGOOMBA)
 _(FIREFLOWER)
 _(FIREBALL)
-_(FIREBALLTRAIL)
 _(SHELL)
 _(PUMA)
-_(PUMATRAIL)
 _(HAMMER)
 _(KOOPA)
 _(KOOPAFLAME)
diff --git a/src/info/states.h b/src/info/states.h
index c284ab3c0..b7cd4477e 100644
--- a/src/info/states.h
+++ b/src/info/states.h
@@ -2299,22 +2299,20 @@ _(FIREFLOWER1)
 _(FIREFLOWER2)
 _(FIREFLOWER3)
 _(FIREFLOWER4)
-_(FIREBALL)
-_(FIREBALLTRAIL1)
-_(FIREBALLTRAIL2)
+_(FIREBALL1)
+_(FIREBALL2)
+_(FIREBALL3)
+_(FIREBALL4)
+_(FIREBALLEXP1)
+_(FIREBALLEXP2)
+_(FIREBALLEXP3)
 _(SHELL)
-_(PUMA_START1)
-_(PUMA_START2)
-_(PUMA_UP1)
-_(PUMA_UP2)
-_(PUMA_UP3)
-_(PUMA_DOWN1)
-_(PUMA_DOWN2)
-_(PUMA_DOWN3)
-_(PUMATRAIL1)
-_(PUMATRAIL2)
-_(PUMATRAIL3)
-_(PUMATRAIL4)
+_(PUMA1)
+_(PUMA2)
+_(PUMA3)
+_(PUMA4)
+_(PUMA5)
+_(PUMA6)
 _(HAMMER)
 _(KOOPA1)
 _(KOOPA2)
diff --git a/src/p_inter.c b/src/p_inter.c
index 68aae9b73..a3c102509 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -2253,7 +2253,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
 
 				K_TryHurtSoundExchange(target, source);
 			}
-			else if (source && source == player->mo && source->player)
+			else
 			{
 				K_DestroyBumpers(player, 1);
 			}