diff --git a/base/src/server/player.qc b/base/src/server/player.qc
index 6425e7b2..70b9cf2a 100644
--- a/base/src/server/player.qc
+++ b/base/src/server/player.qc
@@ -104,6 +104,11 @@ CSEv_PlayerSwitchWeapon_i(int w)
 {
 	player pl = (player)self;
 
+#ifdef WASTES
+	if (pl.gflags & GF_IS_HEALING)
+		return;
+#endif
+
 	if (pl.activeweapon != w) {
 		pl.activeweapon = w;
 		Weapons_Draw(pl);
diff --git a/src/shared/player.qc b/src/shared/player.qc
index 34093844..9302063b 100644
--- a/src/shared/player.qc
+++ b/src/shared/player.qc
@@ -503,6 +503,7 @@ base_player::MakeTempSpectator(void)
 {
 	classname = "player";
 	flags = FL_CLIENT;
+	modelindex = 0;
 	max_health = health = 0;
 	armor = 0;
 	g_items = 0;