diff --git a/src/shared/w_broom.qc b/src/shared/w_broom.qc
index 359ee3d..3a96dc3 100644
--- a/src/shared/w_broom.qc
+++ b/src/shared/w_broom.qc
@@ -213,7 +213,7 @@ weapon_t w_broom =
 	.id		= ITEM_BROOM,
 	.slot		= 0,
 	.slot_pos	= 0,
-	.weight		= -10,
+	.weight		= 1,
 	.draw		= w_broom_draw,
 	.holster	= w_broom_holster,
 	.primary	= w_broom_primary,
diff --git a/src/shared/w_forks.qc b/src/shared/w_forks.qc
index b3e5f44..ccf20bb 100644
--- a/src/shared/w_forks.qc
+++ b/src/shared/w_forks.qc
@@ -349,7 +349,7 @@ weapon_t w_forks =
 	.deathmsg	= w_forks_deathmsg,
 	.aimanim	= w_forks_aimanim,
 	.hudpic		= w_forks_hudpic,
-	.weight		= -10,
+	.weight		= 3,
 	.isempty	= w_forks_isempty,
 	.type		= w_forks_type
 };
diff --git a/src/shared/w_fryingpan.qc b/src/shared/w_fryingpan.qc
index a23bdd7..57b3201 100644
--- a/src/shared/w_fryingpan.qc
+++ b/src/shared/w_fryingpan.qc
@@ -252,7 +252,7 @@ weapon_t w_fryingpan =
 	.deathmsg	= w_fryingpan_deathmsg,
 	.aimanim	= w_fryingpan_aimanim,
 	.hudpic		= w_fryingpan_hudpic,
-	.weight		= -10,
+	.weight		= 2,
 	.isempty	= w_fryingpan_isempty,
 	.type		= w_fryingpan_type
 };
diff --git a/src/shared/w_glove.qc b/src/shared/w_glove.qc
index c966893..cd915ca 100644
--- a/src/shared/w_glove.qc
+++ b/src/shared/w_glove.qc
@@ -267,7 +267,7 @@ weapon_t w_glove =
 	.deathmsg	= w_glove_deathmsg,
 	.aimanim	= w_glove_aimanim,
 	.hudpic		= w_glove_hudpic,
-	.weight		= -10,
+	.weight		= -1,
 	.isempty	= w_glove_isempty,
 	.type		= w_glove_type
 };
diff --git a/src/shared/w_hairspray.qc b/src/shared/w_hairspray.qc
index 4f5e560..af48509 100644
--- a/src/shared/w_hairspray.qc
+++ b/src/shared/w_hairspray.qc
@@ -287,7 +287,7 @@ weapon_t w_hairspray =
 	.deathmsg	= w_hairspray_deathmsg,
 	.aimanim	= w_hairspray_aimanim,
 	.hudpic		= w_hairspray_hudpic,
-	.weight		= -10,
+	.weight		= 8,
 	.isempty	= w_hairspray_isempty,
 	.type		= w_hairspray_type
 };
diff --git a/src/shared/w_knife.qc b/src/shared/w_knife.qc
index 459cd63..cc6a1f9 100644
--- a/src/shared/w_knife.qc
+++ b/src/shared/w_knife.qc
@@ -94,6 +94,12 @@ w_knife_draw(player pl)
 {
 	Weapons_SetModel("models/v_knife.mdl");
 	Weapons_ViewAnimation(pl, KNIFE_DRAW);
+
+#ifdef SERVER
+	if (!pl.ammo_knives) {
+		Weapons_RemoveItem(pl, WEAPON_KNIFE);
+	}
+#endif
 }
 
 void
@@ -181,6 +187,16 @@ w_knife_primary(player pl)
 void
 w_knife_release(player pl)
 {
+	if (pl.w_idle_next > 0.0) {
+		if (pl.w_attack_next <= 0.0) {
+		#ifdef SERVER
+			if (!pl.ammo_knives) {
+				Weapons_RemoveItem(pl, WEAPON_KNIFE);
+			}
+		#endif
+		}
+		return;
+	}
 
 	if (pl.w_idle_next > 0.0) {
 		return;
@@ -302,7 +318,7 @@ weapon_t w_knife =
 	.deathmsg	= w_knife_deathmsg,
 	.aimanim	= w_knife_aimanim,
 	.hudpic		= w_knife_hudpic,
-	.weight		= -10,
+	.weight		= 5,
 	.isempty	= w_knife_isempty,
 	.type		= w_knife_type
 };
diff --git a/src/shared/w_lego.qc b/src/shared/w_lego.qc
index f87ee99..cf16276 100644
--- a/src/shared/w_lego.qc
+++ b/src/shared/w_lego.qc
@@ -281,7 +281,7 @@ weapon_t w_lego =
 	.deathmsg	= w_lego_deathmsg,
 	.aimanim	= w_lego_aimanim,
 	.hudpic		= w_lego_hudpic,
-	.weight		= -10,
+	.weight		= 7,
 	.isempty	= w_lego_isempty,
 	.type		= w_lego_type
 };
diff --git a/src/shared/w_legolauncher.qc b/src/shared/w_legolauncher.qc
index 921c4b7..f371fd7 100644
--- a/src/shared/w_legolauncher.qc
+++ b/src/shared/w_legolauncher.qc
@@ -290,7 +290,7 @@ weapon_t w_legolauncher =
 	.deathmsg	= w_legolauncher_deathmsg,
 	.aimanim	= w_legolauncher_aimanim,
 	.hudpic		= w_legolauncher_hudpic,
-	.weight		= -10,
+	.weight		= 9,
 	.isempty	= w_legolauncher_isempty,
 	.type		= w_legolauncher_type
 };
diff --git a/src/shared/w_machette.qc b/src/shared/w_machette.qc
index dce8ce7..56478b3 100644
--- a/src/shared/w_machette.qc
+++ b/src/shared/w_machette.qc
@@ -295,7 +295,7 @@ weapon_t w_machette =
 	.deathmsg	= w_machette_deathmsg,
 	.aimanim	= w_machette_aimanim,
 	.hudpic		= w_machette_hudpic,
-	.weight		= -10,
+	.weight		= -1,
 	.isempty	= w_machette_isempty,
 	.type		= w_machette_type
 };
diff --git a/src/shared/w_sodalauncher.qc b/src/shared/w_sodalauncher.qc
index 00a2d10..2fb3c6e 100644
--- a/src/shared/w_sodalauncher.qc
+++ b/src/shared/w_sodalauncher.qc
@@ -346,7 +346,7 @@ weapon_t w_sodalauncher = {
 	.deathmsg	= w_sodalauncher_deathmsg,
 	.aimanim	= w_sodalauncher_aimanim,
 	.hudpic		= w_sodalauncher_hudpic,
-	.weight		= -10,
+	.weight		= 6,
 	.isempty	= w_sodalauncher_isempty,
 	.type		= w_sodalauncher_type
 };