diff --git a/src/dm/ball.c b/src/dm/ball.c
index 6b79d99..5877984 100644
--- a/src/dm/ball.c
+++ b/src/dm/ball.c
@@ -299,9 +299,6 @@ DBall_ChangeKnockback(edict_t *targ, edict_t *attacker, int knockback, int mod)
 			case MOD_SSHOTGUN:
 				knockback = knockback / 3;
 				break;
-			case MOD_MACHINEGUN:
-				knockback = (knockback * 3) / 2;
-				break;
 			case MOD_HYPERBLASTER:
 				knockback *= 4;
 				break;
@@ -316,6 +313,7 @@ DBall_ChangeKnockback(edict_t *targ, edict_t *attacker, int knockback, int mod)
 				knockback /= 2;
 				break;
 			case MOD_R_SPLASH:
+			case MOD_MACHINEGUN:
 				knockback = (knockback * 3) / 2;
 				break;
 			case MOD_RAILGUN:
diff --git a/src/dm/tag.c b/src/dm/tag.c
index cfb400d..adbfb7c 100644
--- a/src/dm/tag.c
+++ b/src/dm/tag.c
@@ -18,11 +18,6 @@ int tag_count;
 void
 Tag_PlayerDeath(edict_t *targ, edict_t *inflictor /* unused */, edict_t *attacker /* unused */)
 {
-	if (!targ)
-	{
-		return;
-	}
-
 	if (tag_token && targ && (targ == tag_owner))
 	{
 		Tag_DropToken(targ, FindItem("Tag Token"));
@@ -67,11 +62,6 @@ Tag_KillItBonus(edict_t *self)
 void
 Tag_PlayerDisconnect(edict_t *self)
 {
-	if (!self)
-	{
-		return;
-	}
-
 	if (tag_token && self && (self == tag_owner))
 	{
 		Tag_DropToken(self, FindItem("Tag Token"));