diff --git a/code/modules/mob/living/carbon/human/ai/brain/ai_brain.dm b/code/modules/mob/living/carbon/human/ai/brain/ai_brain.dm
index d9e9f21c76..3a45844112 100644
--- a/code/modules/mob/living/carbon/human/ai/brain/ai_brain.dm
+++ b/code/modules/mob/living/carbon/human/ai/brain/ai_brain.dm
@@ -68,6 +68,7 @@ GLOBAL_LIST_EMPTY(human_ai_brains)
 	GLOB.human_ai_brains += src
 	setup_detection_radius()
 	appraise_inventory()
+	tied_human.a_intent_change(INTENT_DISARM)
 
 /datum/human_ai_brain/Destroy(force, ...)
 	GLOB.human_ai_brains -= src
diff --git a/code/modules/mob/living/carbon/human/ai/brain/ai_brain_targeting.dm b/code/modules/mob/living/carbon/human/ai/brain/ai_brain_targeting.dm
index a471e77a57..7a42a01e7c 100644
--- a/code/modules/mob/living/carbon/human/ai/brain/ai_brain_targeting.dm
+++ b/code/modules/mob/living/carbon/human/ai/brain/ai_brain_targeting.dm
@@ -142,10 +142,13 @@
 	if(HAS_TRAIT(target, TRAIT_CLOAKED) && get_dist(tied_human, target) > cloak_visible_range)
 		return FALSE
 
+	if(!friendly_check(target))
+		return FALSE
+
 	return TRUE
 
-/datum/human_ai_brain/proc/friendly_check()
-	var/list/turf_list = get_line(get_turf(tied_human), get_turf(current_target))
+/datum/human_ai_brain/proc/friendly_check(atom/target)
+	var/list/turf_list = get_line(get_turf(tied_human), get_turf(target))
 	for(var/turf/tile in turf_list)
 		if(istype(tile, /turf/closed))
 			return TRUE
diff --git a/code/modules/mob/living/carbon/human/ai/squad_spawner.dm b/code/modules/mob/living/carbon/human/ai/squad_spawner.dm
index e54e7dac51..5cf22e0e4c 100644
--- a/code/modules/mob/living/carbon/human/ai/squad_spawner.dm
+++ b/code/modules/mob/living/carbon/human/ai/squad_spawner.dm
@@ -147,7 +147,6 @@ GLOBAL_LIST_EMPTY(human_ai_squad_presets)
 		/datum/equipment_preset/clf/soldier/ai = 3,
 		/datum/equipment_preset/clf/medic = 1,
 		/datum/equipment_preset/clf/engineer/ai = 1,
-		/datum/equipment_preset/clf/synth/combat = 1,
 	)
 
 /datum/human_ai_squad_preset/clf/kill_team