diff --git a/engine/code/game/g_active.c b/engine/code/game/g_active.c
index 9e494080..3374c4c4 100644
--- a/engine/code/game/g_active.c
+++ b/engine/code/game/g_active.c
@@ -316,8 +316,6 @@ void ClientImpacts( gentity_t *ent, pmove_t *pm ) {
 
 	memset( &trace, 0, sizeof( trace ) );
 	for (i=0 ; i<pm->numtouch ; i++) {
-// STONELANCE - this should never happen, UPDATE: re-enabled
-// /*
 		for (j=0 ; j<i ; j++) {
 			if (pm->touchents[j] == pm->touchents[i] ) {
 				break;
@@ -326,12 +324,13 @@ void ClientImpacts( gentity_t *ent, pmove_t *pm ) {
 		if (j != i) {
 			continue;	// duplicated
 		}
-// */
+		other = &g_entities[ pm->touchents[i] ];
+
+// STONELANCE
 		VectorSubtract( other->s.origin, pm->touchPos[i], trace.plane.normal );
 		VectorNormalize( trace.plane.normal );
 		VectorCopy(pm->touchPos[i], trace.endpos);
 // END
-		other = &g_entities[ pm->touchents[i] ];
 
 		if ( ( ent->r.svFlags & SVF_BOT ) && ( ent->touch ) ) {
 			ent->touch( ent, other, &trace );
diff --git a/engine/code/q3_ui/ui_team.c b/engine/code/q3_ui/ui_team.c
index a8042240..4bfa1b28 100644
--- a/engine/code/q3_ui/ui_team.c
+++ b/engine/code/q3_ui/ui_team.c
@@ -56,15 +56,6 @@ typedef struct
 
 static teammain_t	s_teammain;
 
-static menuframework_s	s_teammain_menu;
-static menuaction_s		s_teammain_orders;
-static menuaction_s		s_teammain_voice;
-static menuaction_s		s_teammain_joinred;
-static menuaction_s		s_teammain_joinblue;
-static menuaction_s		s_teammain_joingame;
-static menuaction_s		s_teammain_spectate;
-
-
 /*
 ===============
 TeamMain_MenuEvent
@@ -86,7 +77,7 @@ static void TeamMain_MenuEvent( void* ptr, int event ) {
 		UI_ForceMenuOff();
 		break;
 
-	// STONELANCE
+// STONELANCE
 	case ID_JOINGREEN:
 		trap_Cmd_ExecuteText( EXEC_APPEND, "cmd team green\n" );
 		UI_ForceMenuOff();
diff --git a/engine/code/q3_ui/ui_teamorders.c b/engine/code/q3_ui/ui_teamorders.c
index 5fdc1087..ebd9e423 100644
--- a/engine/code/q3_ui/ui_teamorders.c
+++ b/engine/code/q3_ui/ui_teamorders.c
@@ -296,7 +296,7 @@ static void UI_TeamOrdersMenu_BuildBotList( void ) {
 	int		numPlayers;
 	int		isBot;
 	int		n;
-	char	playerTeam;
+	char	playerTeam = '3';
 	char	botTeam;
 	char	info[MAX_INFO_STRING];