diff --git a/source/server/ai/zombie_core.qc b/source/server/ai/zombie_core.qc
index 4a82ff8..1233b91 100644
--- a/source/server/ai/zombie_core.qc
+++ b/source/server/ai/zombie_core.qc
@@ -1614,21 +1614,12 @@ void(entity szombie) SetZombieWalk =
 	}
 };
 
-float() getMaxZombies =
-{
-	if (dogWave == true) {
-		return 2;
-	} else {
-		return MAX_ZOMB;
-	}
-}
-
 void() spawnAllZombEnts =
 {
 	local float i;
 	i = 0;
 
-	while(i < getMaxZombies())//IMPORTANT VALUE, max zombies allowed in map
+	while(i < MAX_ZOMB)
 	{
 		spawnSingleZombEnt(i);
 		i++;
diff --git a/source/server/entities/powerups.qc b/source/server/entities/powerups.qc
index c64f16e..cd856ae 100644
--- a/source/server/entities/powerups.qc
+++ b/source/server/entities/powerups.qc
@@ -58,6 +58,7 @@ inline void(entity ent) PU_FreeEnt =
 {
 	setmodel(ent, "");
 	ent.classname = "freePowerUpEntity";
+	ent.hitcount = 0;
 	ent.touch = SUB_Null;
 	ent.think = SUB_Null;
 	ent.frame = 0;
diff --git a/source/server/entities/traps.qc b/source/server/entities/traps.qc
index 2b05f6e..10c0273 100644
--- a/source/server/entities/traps.qc
+++ b/source/server/entities/traps.qc
@@ -338,7 +338,7 @@ void() set_zapper_bbox =
 		}
 	} else if (self.angles_z) {
 		// Z Axis
-		switch(self.angles_z) {
+		switch(abs(self.angles_z)) {
 			// Pointed 'Upward'
 			case 0:
 				bbmin = '-20 -20 -4';