diff --git a/src/game/server/tf/bot/behavior/tf_bot_scenario_monitor.cpp b/src/game/server/tf/bot/behavior/tf_bot_scenario_monitor.cpp
index c91e907f5e3..f9898c5af85 100644
--- a/src/game/server/tf/bot/behavior/tf_bot_scenario_monitor.cpp
+++ b/src/game/server/tf/bot/behavior/tf_bot_scenario_monitor.cpp
@@ -176,7 +176,7 @@ Action< CTFBot > *CTFBotScenarioMonitor::DesiredScenarioAndClassAction( CTFBot *
 	}
 #endif // TF_RAID_MODE	
 
-	if ( TFGameRules()->IsMannVsMachineMode() )
+	if ( TFGameRules()->IsMannVsMachineMode() && me->GetTeamNumber() == TF_TEAM_PVE_INVADERS ) // Only use this specialized AI for BLU bots
 	{
 		if ( me->IsPlayerClass( TF_CLASS_SPY ) )
 		{
@@ -218,7 +218,7 @@ Action< CTFBot > *CTFBotScenarioMonitor::DesiredScenarioAndClassAction( CTFBot *
 		}
 
 		// capture the flag
-		return new CTFBotFetchFlag;
+		// The normal TFBot AI already captures the flag. See below - Siobhan-Saoirse
 	}
 
 	if ( me->IsPlayerClass( TF_CLASS_SPY ) )
diff --git a/src/game/shared/tf/tf_weaponbase_melee.cpp b/src/game/shared/tf/tf_weaponbase_melee.cpp
index 0dac9870cfc..621c30f0441 100644
--- a/src/game/shared/tf/tf_weaponbase_melee.cpp
+++ b/src/game/shared/tf/tf_weaponbase_melee.cpp
@@ -572,7 +572,7 @@ bool CTFWeaponBaseMelee::OnSwingHit( trace_t &trace )
 		// handle hitting a robot	
 		if ( TFGameRules() && TFGameRules()->IsMannVsMachineMode() )
 		{
-			if ( pTargetPlayer  && pTargetPlayer->GetTeamNumber() == TF_TEAM_PVE_INVADERS && !pTargetPlayer->IsPlayer() )
+			if ( pTargetPlayer  && pTargetPlayer->GetTeamNumber() == TF_TEAM_PVE_INVADERS && pTargetPlayer->IsPlayer() )
 			{
 				bPlayMvMHitOnly = true;