diff --git a/addons/overthrow_main/functions/factions/fn_factionCRIM.sqf b/addons/overthrow_main/functions/factions/fn_factionCRIM.sqf
index a52b0f5a..11435436 100644
--- a/addons/overthrow_main/functions/factions/fn_factionCRIM.sqf
+++ b/addons/overthrow_main/functions/factions/fn_factionCRIM.sqf
@@ -10,7 +10,6 @@ while {sleep 10;true} do {
             _civid = _x;
             if(count _civ == 0) then {
                 //Civ has died, welp, generate a replacement
-                player globalchat format["replacing civ %1",_civid];
                 _cash = round(random 200);
                 _civ = [call OT_fnc_randomLocalIdentity,true,_cash,-1];
                 OT_civilians setVariable [format["%1",_civid],_civ,true];
diff --git a/addons/overthrow_main/functions/player/fn_mapSystem.sqf b/addons/overthrow_main/functions/player/fn_mapSystem.sqf
index c1940ec7..b3a6ec87 100644
--- a/addons/overthrow_main/functions/player/fn_mapSystem.sqf
+++ b/addons/overthrow_main/functions/player/fn_mapSystem.sqf
@@ -230,7 +230,7 @@ _handler = {
 					_pos,
 					0.3/ctrlMapScale (_this select 0),
 					0.3/ctrlMapScale (_this select 0),
-					""
+					0
 				];
 			};
 		}foreach(player getvariable ["owned",[]]);
diff --git a/addons/overthrow_main/functions/player/fn_wantedSystem.sqf b/addons/overthrow_main/functions/player/fn_wantedSystem.sqf
index 58faae8e..01e2d65f 100644
--- a/addons/overthrow_main/functions/player/fn_wantedSystem.sqf
+++ b/addons/overthrow_main/functions/player/fn_wantedSystem.sqf
@@ -256,6 +256,13 @@ while {alive _unit} do {
 							_unit spawn OT_fnc_revealToNATO;
 						}
 					};
+					if(_unit getvariable ["ot_isSmoking",false]) exitWith {
+						_unit setCaptive false;
+						_unit spawn OT_fnc_revealToNATO;
+						if(isPlayer _unit) then {
+							"NATO has seen your spliff!" call OT_fnc_notifyMinor;
+						};
+					};
 					if(count attachedObjects _unit > 0) exitWith {
 						{
 							if(typeOf _x in OT_staticWeapons) exitWith {