diff --git a/addons/client/functions/fnc_convertClientLocation.sqf b/addons/client/functions/fnc_convertClientLocation.sqf
index 8b3a4eb..8f97a14 100644
--- a/addons/client/functions/fnc_convertClientLocation.sqf
+++ b/addons/client/functions/fnc_convertClientLocation.sqf
@@ -74,6 +74,9 @@ switch (toLower worldName) do {
 	case "kunduz_valley": {
 		_realLocation = _position call armatak_fnc_convert_to_kunduz_valley;
 	};
+	case "tanoa": {
+		_realLocation = _position call armatak_fnc_convert_to_tanoa;
+	};
 	default {
 		_warning = format ["<t color='#FF8021'>ARMATAK</t><br/> %1", "Unsupported Map"];
 		[[_warning, 1.5]] call CBA_fnc_notify;
diff --git a/addons/main/functions/api/fn_send_drone_cot.sqf b/addons/main/functions/api/fn_send_drone_cot.sqf
index f160cb5..bed999e 100644
--- a/addons/main/functions/api/fn_send_drone_cot.sqf
+++ b/addons/main/functions/api/fn_send_drone_cot.sqf
@@ -5,7 +5,7 @@
 params["_drone"];
 
 private _atak_role = "a-f-A";
-private _atak_callsign = [_unit] call armatak_fnc_extract_unit_callsign;
+private _atak_callsign = [_drone] call armatak_fnc_extract_unit_callsign;
 
 switch (side _drone) do {
 	case "WEST": {
diff --git a/addons/main/functions/extract_data/fn_extract_group_role.sqf b/addons/main/functions/extract_data/fn_extract_group_role.sqf
index 4e49e38..b99f47a 100644
--- a/addons/main/functions/extract_data/fn_extract_group_role.sqf
+++ b/addons/main/functions/extract_data/fn_extract_group_role.sqf
@@ -1,5 +1,6 @@
 params["_unit"];
 
+_group = group _unit;
 _group_roles = ["Team Member", "Team Lead", "HQ", "Sniper", "Medic", "Forward Observer", "RTO", "K9"];
 _group_role = "Team Member";
 
@@ -34,7 +35,7 @@ if (["officer", typeOf _unit, false] call BIS_fnc_inString) then {
 _pre_defined_role = _unit getVariable "_atak_group_role";
 
 if (!isNil "_pre_defined_role") then {
-	_callsign = _pre_defined_callsign;
+	_callsign = _pre_defined_role;
 };
 
 _group_role
diff --git a/addons/main/functions/fnc_logMessage.sqf b/addons/main/functions/fnc_logMessage.sqf
index 549b0c5..c207855 100644
--- a/addons/main/functions/fnc_logMessage.sqf
+++ b/addons/main/functions/fnc_logMessage.sqf
@@ -1,3 +1,3 @@
-params[_type, _message];
+params["_type", "_message"];
 
 "armatak" callExtension ["log", [_type, _message]]