diff --git a/addons/cargo/functions/fnc_initVehicle.sqf b/addons/cargo/functions/fnc_initVehicle.sqf
index b817688336..efb3b9a5cf 100644
--- a/addons/cargo/functions/fnc_initVehicle.sqf
+++ b/addons/cargo/functions/fnc_initVehicle.sqf
@@ -41,7 +41,7 @@ if (getNumber (configFile >> "CfgVehicles" >> _type >> QGVAR(hasCargo)) != 1) ex
 private ["_text", "_condition", "_statement", "_icon", "_action"];
 _condition = {
     params ["_target", "_player"];
-    GVAR(enable) && {[_player, _target, []] call EFUNC(common,canInteractWith)}
+    GVAR(enable) && {locked _target < 2} && {[_player, _target, []] call EFUNC(common,canInteractWith)}
 };
 _text = localize LSTRING(openMenu);
 _statement = {GVAR(interactionVehicle) = _target; createDialog QGVAR(menu);};
diff --git a/addons/respawn/functions/fnc_restoreGear.sqf b/addons/respawn/functions/fnc_restoreGear.sqf
index 7e55c1d8e2..fd3f03d7aa 100644
--- a/addons/respawn/functions/fnc_restoreGear.sqf
+++ b/addons/respawn/functions/fnc_restoreGear.sqf
@@ -182,15 +182,18 @@ _activeWeapon = _activeWeaponAndMuzzle select 0;
 _activeMuzzle = _activeWeaponAndMuzzle select 1;
 _activeWeaponMode = _activeWeaponAndMuzzle select 2;
 
-if (_activeMuzzle != "" and _activeMuzzle != _activeWeapon) then {
+if (!(_activeMuzzle isEqualTo "") and
+    !(_activeMuzzle isEqualTo _activeWeapon) and
+    (_activeMuzzle in getArray (configfile >> "CfgWeapons" >> _activeWeapon >> "muzzles"))) then {
+
     _unit selectWeapon _activeMuzzle;
 } else {
-    if (_activeWeapon != "") then {
+    if (!(_activeWeapon isEqualTo "")) then {
         _unit selectWeapon _activeWeapon;
     };
 };
 
-if (currentWeapon _unit != "") then {
+if (!(currentWeapon _unit isEqualTo "")) then {
     private ["_index"];
     _index = 0;
     while {