diff --git a/addons/ai/fnc_addWaypoint.sqf b/addons/ai/fnc_addWaypoint.sqf
index dbf711e46..fa2a360fc 100644
--- a/addons/ai/fnc_addWaypoint.sqf
+++ b/addons/ai/fnc_addWaypoint.sqf
@@ -35,7 +35,7 @@ Author:
 params [
     "_group",
     "_position",
-    ["_radius", 0, [0]],
+    ["_radius", -1, [0]],
     ["_type", "MOVE", [""]],
     ["_behaviour", "UNCHANGED", [""]],
     ["_combat", "NO CHANGE", [""]],
diff --git a/addons/ai/fnc_clearWaypoints.sqf b/addons/ai/fnc_clearWaypoints.sqf
index 72bd57c34..d7db9fffc 100644
--- a/addons/ai/fnc_clearWaypoints.sqf
+++ b/addons/ai/fnc_clearWaypoints.sqf
@@ -30,5 +30,5 @@ private _waypoints = waypoints _group;
 } forEach _waypoints;
 
 // Create a self-deleting waypoint at the leader position to halt all planned movement (based on old waypoints)
-private _wp = _group addWaypoint [getPosATL (leader _group), 0];
+private _wp = _group addWaypoint [getPosATL (leader _group), -1];
 _wp setWaypointStatements ["true", "deleteWaypoint [group this,currentWaypoint (group this)]"];
diff --git a/addons/ai/fnc_searchNearby.sqf b/addons/ai/fnc_searchNearby.sqf
index 0c1b229aa..51e689230 100644
--- a/addons/ai/fnc_searchNearby.sqf
+++ b/addons/ai/fnc_searchNearby.sqf
@@ -34,7 +34,7 @@ if ((leader _group) distanceSqr _building > 250e3) exitwith {};
 
     // Add a waypoint to regroup after the search
     _group lockWP true;
-    private _wp = _group addWaypoint [getPos _leader, 0, currentWaypoint _group];
+    private _wp = _group addWaypoint [getPos _leader, -1, currentWaypoint _group];
     private _cond = "({unitReady _x || !(alive _x)} count thisList) == count thisList";
     private _comp = format ["this setFormation '%1'; this setBehaviour '%2'; deleteWaypoint [group this, currentWaypoint (group this)];", formation _group, behaviour _leader];
     _wp setWaypointStatements [_cond, _comp];
diff --git a/addons/ai/fnc_taskAttack.sqf b/addons/ai/fnc_taskAttack.sqf
index 14724bb94..dd4af1e5d 100644
--- a/addons/ai/fnc_taskAttack.sqf
+++ b/addons/ai/fnc_taskAttack.sqf
@@ -26,7 +26,7 @@ Author:
 
 ---------------------------------------------------------------------------- */
 
-params ["_group", "_position", ["_radius", 0], ["_override", false]];
+params ["_group", "_position", ["_radius", -1], ["_override", false]];
 
 _group = _group call CBA_fnc_getGroup;
 if !(local _group) exitWith {}; // Don't create waypoints on each machine
diff --git a/addons/ai/fnc_taskPatrol.sqf b/addons/ai/fnc_taskPatrol.sqf
index d7d5b4fc0..815637939 100644
--- a/addons/ai/fnc_taskPatrol.sqf
+++ b/addons/ai/fnc_taskPatrol.sqf
@@ -55,7 +55,7 @@ _position = _position call CBA_fnc_getPos;
 
 // Can pass parameters straight through to addWaypoint
 _this =+ _this;
-_this set [2,0];
+_this set [2,-1];
 if (count _this > 3) then {
     _this deleteAt 3;
 };
diff --git a/addons/ai/fnc_taskSearchArea.sqf b/addons/ai/fnc_taskSearchArea.sqf
index f751f2e1a..f5be3b40a 100644
--- a/addons/ai/fnc_taskSearchArea.sqf
+++ b/addons/ai/fnc_taskSearchArea.sqf
@@ -89,7 +89,7 @@ _onComplete = _statements joinString ";";
 [
     _group,
     _pos,
-    0,
+    -1,
     "MOVE",
     _behaviour,
     _combat,
diff --git a/addons/ai/fnc_waypointGarrison.sqf b/addons/ai/fnc_waypointGarrison.sqf
index 627cf386d..eb08ffe48 100644
--- a/addons/ai/fnc_waypointGarrison.sqf
+++ b/addons/ai/fnc_waypointGarrison.sqf
@@ -14,7 +14,7 @@ Returns:
 
 Examples:
    (begin example)
-   _group addWaypoint [_position, 0] setWaypointScript "\x\cba\addons\ai\fnc_waypointGarrison.sqf []";
+   _group addWaypoint [_position, -1] setWaypointScript "\x\cba\addons\ai\fnc_waypointGarrison.sqf []";
 
    [_group, _position] execVM "\x\cba\addons\ai\fnc_waypointGarrison.sqf";
    (end)