diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
index 793e7b6b2f35..f36441d0a5f9 100644
--- a/code/__DEFINES/traits.dm
+++ b/code/__DEFINES/traits.dm
@@ -200,6 +200,10 @@
 #define TRAIT_TOOL_SIMPLE_BLOWTORCH "t_tool_simple_blowtorch"
 
 #define TRAIT_TOOL_PEN "t_tool_pen"
+
+/// Can lockout blackmarket from ASRS console circuits.
+#define TRAIT_TOOL_TRADEBAND "t_tool_tradeband"
+
 // CLOTHING TRAITS
 #define TRAIT_CLOTHING_HOOD "t_clothing_hood"
 
diff --git a/code/datums/emergency_calls/inspection.dm b/code/datums/emergency_calls/inspection.dm
index 5cd97b1a1661..4c33d7d9bfa3 100644
--- a/code/datums/emergency_calls/inspection.dm
+++ b/code/datums/emergency_calls/inspection.dm
@@ -271,6 +271,8 @@
 	shuttle_id = "Distress_PMC"
 
 	max_synths = 0
+	will_spawn_icc_liaison = TRUE
+	will_spawn_cmb_observer = FALSE
 
 /datum/emergency_call/inspection_cmb/black_market/New()
 	..()
@@ -278,9 +280,6 @@
 	arrival_message = "Incoming Transmission: [MAIN_SHIP_NAME], this is Anchorpoint Station with the Colonial Marshal Bureau. Be advised, we are dispatching a team of Marshals to board with you by request of GSO-91. Submitting authorized docking clearances, over."
 	objectives = "Investigate the inconsistencies aboard the [MAIN_SHIP_NAME]'s ASRS. In the case of illegal activity, collect evidence, and submit a report to the CMB Command at Anchorpoint Station. If required, the ICC Liaison's Tradeband is capable of fixing ASRS computers. Work with the [MAIN_SHIP_NAME]'s military police force."
 
-	will_spawn_icc_liaison = TRUE
-	will_spawn_cmb_observer = FALSE
-
 /datum/emergency_call/inspection_cmb/black_market/create_member(datum/mind/current_mind, turf/override_spawn_loc)
 	var/turf/spawn_loc = override_spawn_loc ? override_spawn_loc : get_spawn_point()
 
diff --git a/code/game/objects/items/circuitboards/computer.dm b/code/game/objects/items/circuitboards/computer.dm
index bbd845f16cc3..db19b79ac0fd 100644
--- a/code/game/objects/items/circuitboards/computer.dm
+++ b/code/game/objects/items/circuitboards/computer.dm
@@ -191,7 +191,7 @@
 					to_chat(user, SPAN_WARNING("You weaken the broadcasting function with \the [tool], and the red light stops blinking, turning off. It's probably good now."))
 					contraband_enabled = FALSE
 
-	if(istype(tool, /obj/item/device/cmb_black_market_tradeband))
+	if(HAS_TRAIT(tool, TRAIT_TOOL_TRADEBAND))
 
 		if(!skillcheck(user, SKILL_POLICE, SKILL_POLICE_SKILLED))
 			to_chat(user, SPAN_NOTICE("You do not know how to use [tool]"))
@@ -216,6 +216,7 @@
 
 		playsound(tool, 'sound/machines/ping.ogg', 25)
 		black_market_lock = TRUE
+		contraband_enabled = FALSE
 		tool.icon_state = initial(tool.icon_state)
 
 	else ..()
diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm
index 25b1aff2da09..99237c3b99a9 100644
--- a/code/game/supplyshuttle.dm
+++ b/code/game/supplyshuttle.dm
@@ -1039,7 +1039,7 @@ var/datum/controller/supply/supply_controller = new()
 					supply_order.approvedby = usr.name
 					msg_admin_niche("[usr] confirmed supply order of [supply_pack.name].")
 					if(supply_controller.black_market_heat == 100)
-						supply_controller.black_market_CMB_investigation()
+						supply_controller.black_market_investigation()
 					var/pack_source = "Cargo Hold"
 					var/pack_name = supply_pack.name
 					if(supply_pack.dollar_cost)
@@ -1250,7 +1250,7 @@ var/datum/controller/supply/supply_controller = new()
 	/// For code readability.
 	addtimer(CALLBACK(GLOBAL_PROC, /proc/playsound, get_rand_sound_tile(), sound_to_play, 25, FALSE), timer)
 
-/datum/controller/supply/proc/black_market_CMB_investigation()
+/datum/controller/supply/proc/black_market_investigation()
 	black_market_heat = -1
 	SSticker.mode.get_specific_call("Inspection - Colonial Marshal Ledger Investigation Team", FALSE, TRUE, FALSE)
 	log_game("Black Market Inspection auto-triggered.")
diff --git a/code/modules/gear_presets/cmb.dm b/code/modules/gear_presets/cmb.dm
index 2cbf682eccbd..2c09b8c89b6d 100644
--- a/code/modules/gear_presets/cmb.dm
+++ b/code/modules/gear_presets/cmb.dm
@@ -348,10 +348,10 @@
 	name = "CMB - ICC Liaison - Black Market ERT"
 	skills = /datum/skills/civilian/icc_investigation
 
-/datum/equipment_preset/cmb/liaison/black_market/load_gear(mob/living/carbon/human/H)
+/datum/equipment_preset/cmb/liaison/black_market/load_gear(mob/living/carbon/human/new_human)
 	. = ..()
-	H.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full, WEAR_WAIST) //Tool belt to open ASRS
-	H.equip_to_slot_or_del(new /obj/item/device/cmb_black_market_tradeband, WEAR_IN_BACK) //Tradeband to disable black market
+	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full, WEAR_WAIST) //Tool belt to open ASRS
+	new_human.equip_to_slot_or_del(new /obj/item/device/cmb_black_market_tradeband, WEAR_IN_BACK) //Tradeband to disable black market
 
 //*****************************************************************************************************/