diff --git a/src/game/server/gamecontroller.cpp b/src/game/server/gamecontroller.cpp
index f25f88308..b427c4b54 100644
--- a/src/game/server/gamecontroller.cpp
+++ b/src/game/server/gamecontroller.cpp
@@ -265,7 +265,7 @@ bool IGameController::OnEntity(int Index, vec2 Pos, int Layer, int Flags, int Nu
 		sides2[6]=GameServer()->Collision()->Entity(x-2,y, Layer);
 		sides2[7]=GameServer()->Collision()->Entity(x-2,y+2, Layer);
 
-		float AngularSpeed;
+		float AngularSpeed = 0.0;
 		int Ind=Index-ENTITY_LASER_STOP;
 		int M;
 		if (Ind<0)
diff --git a/src/game/server/teams.cpp b/src/game/server/teams.cpp
index ebc9701e2..d87d5cecf 100644
--- a/src/game/server/teams.cpp
+++ b/src/game/server/teams.cpp
@@ -130,11 +130,13 @@ bool CGameTeams::SetCharacterTeam(int id, int Team)
 	if(Team == TEAM_SUPER && !Character(id)->m_Super) return false;
 	//if you begin race
 	if(Character(id)->m_DDRaceState != DDRACE_NONE)
+	{
 		//you will be killed if you try to join FLOCK
 		if(Team == TEAM_FLOCK && m_Core.Team(id) != TEAM_FLOCK)
 			Character(id)->GetPlayer()->KillCharacter(WEAPON_GAME);
 		else if(Team != TEAM_SUPER)
 			return false;
+	}
 	SetForceCharacterTeam(id, Team);