diff --git a/dayz_code/actions/repair_cancel.sqf b/dayz_code/actions/repair_cancel.sqf
index f466454fb..848d2d043 100644
--- a/dayz_code/actions/repair_cancel.sqf
+++ b/dayz_code/actions/repair_cancel.sqf
@@ -1,3 +1,4 @@
 private [];
 {dayz_myCursorTarget removeAction _x} forEach s_player_repairActions;s_player_repairActions = [];
-s_player_repair_crtl = -1;
\ No newline at end of file
+s_player_repair_crtl = -1;
+dayz_myCursorTarget = objNull;
\ No newline at end of file
diff --git a/dayz_code/actions/salvage_vehicle.sqf b/dayz_code/actions/salvage_vehicle.sqf
index 90fcd56d9..5528a9f26 100644
--- a/dayz_code/actions/salvage_vehicle.sqf
+++ b/dayz_code/actions/salvage_vehicle.sqf
@@ -61,6 +61,5 @@ if(count _hitpoints > 0 ) then {
 	
 	_cancel = dayz_myCursorTarget addAction ["Cancel", "\z\addons\dayz_code\actions\repair_cancel.sqf","repair", 0, true, false, "",""];
 	s_player_repairActions set [count s_player_repairActions,_cancel];
-
 	s_player_repair_crtl = 1;
 };
diff --git a/dayz_code/compile/fn_selfActions.sqf b/dayz_code/compile/fn_selfActions.sqf
index 7409612e7..d60c94d5d 100644
--- a/dayz_code/compile/fn_selfActions.sqf
+++ b/dayz_code/compile/fn_selfActions.sqf
@@ -95,7 +95,7 @@ if (!isNull cursorTarget and !_inVehicle and (player distance cursorTarget < 4))
 	
 
 	// Allow Owner to lock and unlock vehicle  
-	if(_isVehicle and !_isMan and _canDo and _ownerID == dayz_playerUID) then {
+	if(_isVehicle and !_isMan and _canDo and _ownerID != "0" and _ownerID == dayz_playerUID) then {
 			
 		if (s_player_lockUnlock_crtl < 0) then {
 			_Unlock = player addAction [format["Unlock %1",_text], "\z\addons\dayz_code\actions\unlock_veh.sqf",cursorTarget, 2, true, true, "", "(locked cursorTarget)"];
@@ -199,7 +199,7 @@ if (!isNull cursorTarget and !_inVehicle and (player distance cursorTarget < 4))
 	};
 
 	//Allow owner to unlock vault
-	if(cursorTarget isKindOf "VaultStorageLocked" and _canDo) then {
+	if(cursorTarget isKindOf "VaultStorageLocked" and _canDo and _ownerID != "0") then {
 		if (_ownerID == dayz_playerUID) then {
 			if ((s_player_unlockvault < 0) and (player distance cursorTarget < 3)) then {
 				s_player_unlockvault = player addAction ["Unlock Vault", "\z\addons\dayz_code\actions\vault_unlock.sqf",cursorTarget, 0, false, true, "",""];
@@ -216,7 +216,7 @@ if (!isNull cursorTarget and !_inVehicle and (player distance cursorTarget < 4))
 	};
 
 	//Allow owner to pack vault
-	if(cursorTarget isKindOf "VaultStorage" and _canDo and _ownerID == dayz_playerUID) then {
+	if(cursorTarget isKindOf "VaultStorage" and _canDo and _ownerID != "0" and _ownerID == dayz_playerUID) then {
 		if ((s_player_packvault < 0) and (player distance cursorTarget < 3)) then {
 			s_player_packvault = player addAction ["Pack Vault", "\z\addons\dayz_code\actions\vault_pack.sqf",cursorTarget, 0, false, true, "",""];
 		};