diff --git a/src/k_collide.cpp b/src/k_collide.cpp
index c5cef9e7f..423a7d2d1 100644
--- a/src/k_collide.cpp
+++ b/src/k_collide.cpp
@@ -695,9 +695,9 @@ boolean K_DropTargetCollide(mobj_t *t1, mobj_t *t2)
 		S_StartSound(t2, sfx_kdtrg1);
 	}
 
-	if (t1->tracer && t1->tracer->player && t1->player && t1->player != t1->tracer->player)
+	if (t1->tracer && t1->tracer->player && t2->player && t2->player != t1->tracer->player)
 	{
-		K_SpawnAmps(t1->tracer->player, K_PvPAmpReward(20, t1->tracer->player, t1->player), t1);
+		K_SpawnAmps(t1->tracer->player, K_PvPAmpReward(20, t1->tracer->player, t2->player), t1);
 	}
 
 	if (draggeddroptarget && !P_MobjWasRemoved(draggeddroptarget) && draggeddroptarget->player)
diff --git a/src/p_inter.c b/src/p_inter.c
index 94df7bdf2..598487390 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -3300,10 +3300,12 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
 				type = DMG_STUMBLE;
 			}
 
-			if (inflictor && !P_MobjWasRemoved(inflictor) && P_IsKartItem(inflictor->type) && inflictor->cvmem)
+			if (inflictor && !P_MobjWasRemoved(inflictor) && P_IsKartItem(inflictor->type) && inflictor->cvmem
+				&& inflictor->type != MT_BANANA) // Are there other designed trap items that can be deployed and dropped? If you add one, list it here!
 			{
 				type = DMG_STUMBLE;
 				player->ringburst += 5; // IT'S THE DAMAGE STUMBLE HACK AGAIN AAAAAAAAHHHHHHHHHHH
+				K_PopPlayerShield(player);
 			}
 
 			switch (type)