diff --git a/src/g_misc.c b/src/g_misc.c
index a62d1b6..1dfc235 100644
--- a/src/g_misc.c
+++ b/src/g_misc.c
@@ -1682,7 +1682,7 @@ void misc_viper_bomb_touch (edict_t *self, edict_t *other, cplane_t *plane, csur
 	G_UseTargets (self, self->activator);
 
 	self->s.origin[2] = self->absmin[2] + 1;
-	T_RadiusDamage (self, self, self->dmg, NULL, self->dmg+40, MOD_BOMB);
+	T_RadiusDamage (self, self, self->dmg, self, self->dmg+40, MOD_BOMB);
 	BecomeExplosion2 (self);
 }
 
diff --git a/src/g_target.c b/src/g_target.c
index 43c9943..1c49a83 100644
--- a/src/g_target.c
+++ b/src/g_target.c
@@ -325,7 +325,7 @@ void target_explosion_explode (edict_t *self)
 		gi.multicast (self->s.origin, MULTICAST_PHS);
 	}
 
-	T_RadiusDamage (self, self->activator, self->dmg, NULL, self->dmg+40, MOD_EXPLOSIVE);
+	T_RadiusDamage (self, self->activator, self->dmg, self, self->dmg+40, MOD_EXPLOSIVE);
 
 	save = self->delay;
 	self->delay = 0;
diff --git a/src/zaero/item.c b/src/zaero/item.c
index f6c171e..3cb3e40 100644
--- a/src/zaero/item.c
+++ b/src/zaero/item.c
@@ -214,11 +214,6 @@ edict_t *findNextCamera(edict_t *old)
 {
 	edict_t *e = NULL;
 
-	if (!old)
-	{
-		return NULL;
-	}
-
 	// first of all, are there *any* cameras?
 	e = G_Find(NULL, FOFS(classname), "misc_securitycamera");
 	if (e == NULL)
diff --git a/src/zaero/weapon.c b/src/zaero/weapon.c
index cda716c..91a17c7 100644
--- a/src/zaero/weapon.c
+++ b/src/zaero/weapon.c
@@ -116,7 +116,7 @@ void TripBomb_Explode (edict_t *ent)
 		return;
 	}
 
-	T_RadiusDamage(ent, ent->owner ? ent->owner : ent, ent->dmg, ent->enemy, ent->dmg_radius, MOD_TRIPBOMB);
+	T_RadiusDamage(ent, ent->owner ? ent->owner : ent, ent->dmg, ent, ent->dmg_radius, MOD_TRIPBOMB);
 
 	VectorMA (ent->s.origin, -0.02, ent->velocity, origin);