diff --git a/addons/kestrel/XEH_preInit.sqf b/addons/kestrel/XEH_preInit.sqf
index d5e9174489..09d9b1a0ef 100644
--- a/addons/kestrel/XEH_preInit.sqf
+++ b/addons/kestrel/XEH_preInit.sqf
@@ -7,6 +7,5 @@ PREP(openKestrel);
 PREP(closeKestrel);
 
 GVAR(isKestrel) = false;
-GVAR(isKestrelWheel) = false;
 
 ADDON = true;
diff --git a/addons/movement/functions/fnc_climb.sqf b/addons/movement/functions/fnc_climb.sqf
index 8a2988f00f..3f09b82a15 100644
--- a/addons/movement/functions/fnc_climb.sqf
+++ b/addons/movement/functions/fnc_climb.sqf
@@ -9,12 +9,12 @@ if !([_unit] call FUNC(canClimb)) exitWith {
 	[localize "STR_ACE_Movement_CanNotClimb"] call EFUNC(common,displayTextStructured);
 };
 
-if !(_unit getVariable ["ACE_isClimbInit", false]) then {
+if !(_unit getVariable [QGVAR(isClimbInit), false]) then {
 	_unit addEventHandler ["AnimDone", {
 		if (local (_this select 0) && {_this select 1 == "ACE_Climb"}) then {_this call FUNC(handleClimb)};
 	}];
 
-	_unit setVariable ["ACE_isClimbInit", true];
+	_unit setVariable [QGVAR(isClimbInit), true];
 };
 
 [_unit] call EFUNC(common,fixLoweredRifleAnimation);