diff --git a/fbxa/bot_ai.qc b/fbxa/bot_ai.qc
index c8c0f3c..63e74af 100644
--- a/fbxa/bot_ai.qc
+++ b/fbxa/bot_ai.qc
@@ -47,6 +47,7 @@ this notice in its entirety.
 float stagger_think;
 
 @implementation Bot (AI)
+
 /*
 -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
@@ -519,7 +520,6 @@ the bot finds things it wants to kill/grab.
 // 50 - 90 bot will hunt these as vital items
 
 // *!* Make sure you add code to checkLost to remove the target *!*
-
 -(integer)priority:(Bot)bot
 {
 	local integer p;
diff --git a/fbxa/bot_qw.qc b/fbxa/bot_qw.qc
index 5080ff2..75d926f 100644
--- a/fbxa/bot_qw.qc
+++ b/fbxa/bot_qw.qc
@@ -256,7 +256,9 @@ ClientNumber =
 	do {
 		f++;
 		e = nextent (e);
-	} while (e != cl);
+	} while (f < 33 && e != cl);
+	if (f == 33)
+		Break ();
 	return f;
 };
 
diff --git a/fbxa/bot_way.qc b/fbxa/bot_way.qc
index 871d85e..262b8d9 100644
--- a/fbxa/bot_way.qc
+++ b/fbxa/bot_way.qc
@@ -55,7 +55,7 @@ integer bot_way_linker;
 	if (current_way == what)
 		current_way = NIL;
 	[waypoint_array removeItem:what];
-	[what free];
+	[what dealloc];
 }
 
 /*