bugfixes for addWaypoint & taskAmbush