diff --git a/mods/bots/maps/mp/bots/_bot.gsc b/mods/bots/maps/mp/bots/_bot.gsc
index 8143211..53e169a 100644
--- a/mods/bots/maps/mp/bots/_bot.gsc
+++ b/mods/bots/maps/mp/bots/_bot.gsc
@@ -142,7 +142,7 @@ init()
 
 	level.teamBased = true;
 
-	if ( getcvar( "gamemode" ) == "dm" )
+	if ( getcvar( "g_gametype" ) == "dm" )
 		level.teamBased = false;
 }
 
@@ -455,7 +455,7 @@ connected()
 spawnBot()
 {
 	self endon( "disconnect" );
-	
+
 	wait 5;
 
 	self notify( "menuresponse", game["menu_team"], "autoassign" );
diff --git a/mods/bots/maps/mp/bots/_bot_internal.gsc b/mods/bots/maps/mp/bots/_bot_internal.gsc
index e5153ba..185a3b7 100644
--- a/mods/bots/maps/mp/bots/_bot_internal.gsc
+++ b/mods/bots/maps/mp/bots/_bot_internal.gsc
@@ -259,7 +259,6 @@ doBotMovement_loop( data )
 
 	// move!
 	self botMovement( int( dir[0] ), int( dir[1] ) );
-	self setOrigin( self.origin + vector_scale( vectorNormalize( move_To - self.origin ), 25 ) );
 }
 
 /*
@@ -2099,7 +2098,10 @@ bot_lookat( pos, time, vel )
 	}
 }
 
-botStop() {}
-botAction( a ) {}
-botMovement( a, b ) {}
-botWeapon( a ) {}
+/*
+	Weapon
+*/
+botWeapon( a )
+{
+	self switchToWeapon( a );
+}