diff --git a/fbxa/bot_ai.qc b/fbxa/bot_ai.qc
index c0d8fad..e1ff084 100644
--- a/fbxa/bot_ai.qc
+++ b/fbxa/bot_ai.qc
@@ -571,14 +571,16 @@ the bot finds things it wants to kill/grab.
 	foe = [Target forEntity:findradius (ent.origin, radius)];
 	bestp = 1;
 	while (foe) {
-		thatp = [self priorityForThing:foe];
-		if (thatp)
-			if (!scope)
-				if (!sisible (ent, foe.ent, foe.ent.origin))
-					thatp = 0;
-		if (thatp > bestp) {
-			bestp = thatp;
-			best = foe;
+		if (foe != self) {
+			thatp = [self priorityForThing:foe];
+			if (thatp)
+				if (!scope)
+					if (!sisible (ent, foe.ent, foe.ent.origin))
+						thatp = 0;
+			if (thatp > bestp) {
+				bestp = thatp;
+				best = foe;
+			}
 		}
 		foe = [Target forEntity:foe.ent.chain];
 	}
@@ -670,7 +672,7 @@ generally making the bot look good.
 		while (ent.v_angle.x > 180)
 			ent.v_angle.x -= 360;
 	} else if ((ent.enemy == NIL || ent.enemy.movetype == MOVETYPE_PUSH)
-			   && targets[0].ent.classname != "player") {
+			   && (targets[0] ? targets[0].ent.classname != "player" : 1)) {
 		keys &= ~KEY_LOOK;
 		ent.v_angle = b_angle;
 		while (ent.v_angle.x < -180)
diff --git a/fbxa/bot_qw.qc b/fbxa/bot_qw.qc
index 3206791..a119bb8 100644
--- a/fbxa/bot_qw.qc
+++ b/fbxa/bot_qw.qc
@@ -214,7 +214,7 @@ ClientFixRankings =
 		btmp = nextent (btmp);
 	}
 };
-		
+
 void ()
 ClientInRankings =
 {
@@ -321,7 +321,7 @@ void () BotImpulses =
 
 - (id) initWithEntity:(entity) e named:(bot_data_t [])name skill:(integer)skill
 {
-	local integer cl_no = ClientNumber (@self);
+	local integer cl_no = ClientNumber (e);
 	local entity uself;
 
 	SV_Spawn (e);
@@ -329,6 +329,8 @@ void () BotImpulses =
 	if (!(self = [super initWithEntity:e]))
 		return NIL;
 
+	players[cl_no] = self;
+
 	b_clientno = cl_no + 1;
 	b_clientflag = 1 << cl_no;
 	
@@ -358,8 +360,6 @@ void () BotImpulses =
 	PutClientInServer ();
 	@self = uself;
 
-	players[cl_no] = self;
-
 	return self;
 }
 
diff --git a/fbxa/libfrikbot.h b/fbxa/libfrikbot.h
index 2d2584c..6677660 100644
--- a/fbxa/libfrikbot.h
+++ b/fbxa/libfrikbot.h
@@ -14,7 +14,7 @@ typedef struct bot_data_t bot_data_t;
 @public
 	Waypoint current_way;
 }
-+(Target)forEntity:(entity)ent;
++(Target)forEntity:(entity)e;
 -(vector)realorigin;
 -(vector)origin;
 -(integer)canSee:(Target)targ ignoring:(entity)ignore;
diff --git a/fbxa/target.r b/fbxa/target.r
index b29ac79..acfe60b 100644
--- a/fbxa/target.r
+++ b/fbxa/target.r
@@ -68,28 +68,28 @@ struct target_s = {
 
 @implementation Target
 
-+(Target)forEntity:(entity)ent
++(Target)forEntity:(entity)e
 {
 	local Target t;
 	local struct target_s ele;
 
-	if (!ent)
+	if (!e)
 		return NIL;
 
-	if (ent.classname == "player")
-		return ent.@this;
+	if (e.classname == "player")
+		return e.@this;
 
 	if (!target_tab) {
 		target_tab = Hash_NewTable (1021, NIL, NIL, NIL);
 		Hash_SetHashCompare (target_tab, target_get_hash, target_compare);
 	}
-	ele.ent = ent;
+	ele.ent = e;
 	t = Hash_FindElement (target_tab, &ele);
 	if (t)
 		return t;
 
 	t = [[Target alloc] init];
-	t.ent = ent;
+	t.ent = e;
 	Hash_AddElement (target_tab, t);
 	return t;
 }