diff --git a/source/src/bot/ac_bot.cpp b/source/src/bot/ac_bot.cpp
index 6434bbd9..d824deaf 100644
--- a/source/src/bot/ac_bot.cpp
+++ b/source/src/bot/ac_bot.cpp
@@ -24,7 +24,7 @@ extern void spawnstate(playerent *d);
 void CACBot::Spawn()
 {
      // Init all bot variabeles     
-     m_pMyEnt->nextprimary = GUN_SUBGUN;//m_pMyEnt->nextprimary = 2 + rnd(4);
+     m_pMyEnt->nextprimary = 2 + rnd(4);
      m_pMyEnt->targetyaw = m_pMyEnt->targetpitch = 0.0f;
 	 equip(m_pMyEnt);
      m_pMyEnt->armour = 0;
diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
index e08301a5..9d93ef98 100644
--- a/source/src/clientgame.cpp
+++ b/source/src/clientgame.cpp
@@ -585,7 +585,7 @@ void startmap(char *name)   // called just after a map load
     spawnplayer(player1);
     player1->frags = 0;
     player1->flagscore = 0;
-	if(m_teammode) newteam(player1->team); // ensure valid team
+	//if(m_teammode) newteam(player1->team); // ensure valid team // TESTME
     loopv(players) if(players[i]) players[i]->frags = players[i]->flagscore = 0;
     s_strcpy(clientmap, name);
     if(editmode) toggleedit();
diff --git a/source/src/clients2c.cpp b/source/src/clients2c.cpp
index 345ad1d1..27cb6f20 100644
--- a/source/src/clients2c.cpp
+++ b/source/src/clients2c.cpp
@@ -500,7 +500,7 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
 		case SV_FORCETEAM:
 		{
 			changeteam(getint(p));
-
+			spawnplayer(player1);
 			break;
 		};
 
@@ -509,7 +509,7 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
 			conoutf("autoteam is %s", (autoteambalance = getint(p) == 1) ? "enabled" : "disabled");
 			break;
 		};
-               
+
         /* demo recording compat */
         case SV_PING:
             getint(p);
diff --git a/source/vcpp/cube.suo b/source/vcpp/cube.suo
index e0b11fab..5d892955 100644
Binary files a/source/vcpp/cube.suo and b/source/vcpp/cube.suo differ
diff --git a/source/vcpp/cube.vcproj b/source/vcpp/cube.vcproj
index 120ac179..c9d9a166 100644
--- a/source/vcpp/cube.vcproj
+++ b/source/vcpp/cube.vcproj
@@ -106,6 +106,7 @@
 			/>
 			<Tool
 				Name="VCManifestTool"
+				EmbedManifest="true"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"