diff --git a/scripts/player/player_pickup.gd b/scripts/player/player_pickup.gd
index 2c11d16..9e2259c 100644
--- a/scripts/player/player_pickup.gd
+++ b/scripts/player/player_pickup.gd
@@ -10,7 +10,7 @@ func _ready() -> void:
 
 func on_body_entered(body: Node3D):
 	if body is DroppableWeapon:
-		if weapon_system.can_add(body.slot) == false:
+		if weapon_system.can_add(body.slot) == false or (body.team != Session.TEAMS.UNASSIGNED and get_parent().team != body.team):
 			return
 		weapon_spawner.spawn({
 			"ammo": body.weapon.ammo,
diff --git a/scripts/player/states/falling.gd b/scripts/player/states/falling.gd
index 136d4e8..16fefd0 100644
--- a/scripts/player/states/falling.gd
+++ b/scripts/player/states/falling.gd
@@ -26,5 +26,5 @@ func physics_update(delta: float) -> void:
 	if direction:
 		if abs(player.velocity.x + direction.x * acceleration * delta) < abs(modified_max_speed * direction.x):
 			player.velocity.x += direction.x * acceleration * delta
-		if abs(player.velocity.y + direction.y * acceleration * delta) < abs(modified_max_speed * direction.y):
+		if abs(player.velocity.z + direction.z * acceleration * delta) < abs(modified_max_speed * direction.z):
 			player.velocity.z += direction.z * acceleration * delta