diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/MR43.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/MR43.hpp
index fcc488ab2..4bd74f283 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/MR43.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/MR43.hpp
@@ -9,7 +9,7 @@ class MR43_DZ : Rifle
 	
 	magazines[] =
 	{
-		2Rnd_12Gauge_Buck;		
+		2Rnd_12Gauge_Buck,
 		2Rnd_12Gauge_Slug		
 	};
 	
@@ -46,4 +46,4 @@ class MR43_DZ : Rifle
 		recoil = "recoil_single_primary_9outof10";
 		recoilProne = "recoil_single_primary_prone_8outof10";
 	};
-};
\ No newline at end of file
+};
diff --git a/SQF/dayz_code/actions/player_build.sqf b/SQF/dayz_code/actions/player_build.sqf
index c78c9841b..2939fab84 100644
--- a/SQF/dayz_code/actions/player_build.sqf
+++ b/SQF/dayz_code/actions/player_build.sqf
@@ -433,10 +433,11 @@ if (_canBuild select 0) then {
 					};
 
 					_tmpbuilt setVariable ["CharacterID",_combination,true];
-					PVDZ_obj_Publish = [_combination,_tmpbuilt,[_dir,_location],[]];
 					if (DZE_permanentPlot) then {
 						_tmpbuilt setVariable ["ownerPUID",_playerUID,true];
 						PVDZ_obj_Publish = [_combination,_tmpbuilt,[_dir,_location,_playerUID],_classname];
+					} else {
+						PVDZ_obj_Publish = [_combination,_tmpbuilt,[_dir,_location],[]];
 					};
 					publicVariableServer "PVDZ_obj_Publish";
 
@@ -452,9 +453,10 @@ if (_canBuild select 0) then {
 					if(_tmpbuilt isKindOf "Land_Fire_DZ") then {
 						_tmpbuilt spawn player_fireMonitor;
 					} else {
-						PVDZ_obj_Publish = [dayz_characterID,_tmpbuilt,[_dir,_location],[]];
 						if (DZE_permanentPlot) then {
 							PVDZ_obj_Publish = [dayz_characterID,_tmpbuilt,[_dir,_location,_playerUID],_classname];
+						} else {
+							PVDZ_obj_Publish = [dayz_characterID,_tmpbuilt,[_dir,_location],[]];
 						};
 						publicVariableServer "PVDZ_obj_Publish";
 					};
@@ -481,4 +483,4 @@ if (_canBuild select 0) then {
 	};
 };
 
-DZE_ActionInProgress = false;
\ No newline at end of file
+DZE_ActionInProgress = false;
diff --git a/SQF/dayz_code/actions/player_buildingDowngrade.sqf b/SQF/dayz_code/actions/player_buildingDowngrade.sqf
index 2d6a30a7d..da431dd7e 100644
--- a/SQF/dayz_code/actions/player_buildingDowngrade.sqf
+++ b/SQF/dayz_code/actions/player_buildingDowngrade.sqf
@@ -103,12 +103,14 @@ if ((count _upgrade) > 0) then {
 		// Set location
 		_object setPosATL _location;
 
-
 		format[localize "str_epoch_player_142",_text] call dayz_rollingMessages;
 
-		PVDZE_obj_Swap = [_objectCharacterID,_object,[_dir,_location, _vector],_classname,_obj,player];
 		if (DZE_permanentPlot) then {
+			_ownerID = _obj getVariable["ownerPUID","0"];
+			_object setVariable ["ownerPUID",_ownerID,true];
 			PVDZE_obj_Swap = [_objectCharacterID,_object,[_dir,_location,_playerUID, _vector],_classname,_obj,player];
+		} else {
+			PVDZE_obj_Swap = [_objectCharacterID,_object,[_dir,_location, _vector],_classname,_obj,player];
 		};
 		publicVariableServer "PVDZE_obj_Swap";
 
diff --git a/SQF/dayz_code/actions/player_upgrade.sqf b/SQF/dayz_code/actions/player_upgrade.sqf
index c7cf91d06..d3f1d4f98 100644
--- a/SQF/dayz_code/actions/player_upgrade.sqf
+++ b/SQF/dayz_code/actions/player_upgrade.sqf
@@ -110,10 +110,6 @@ if ((count _upgrade) > 0) then {
 
 			// Set location
 			_object setPosATL _location;
-			if (DZE_permanentPlot) then {
-				_ownerID = _obj getVariable["ownerPUID","0"];
-				_object setVariable ["ownerPUID",_ownerID,true];
-			};
 
 			if (_lockable == 3) then {
 
@@ -128,8 +124,14 @@ if ((count _upgrade) > 0) then {
 			} else {	
 				format[localize "str_epoch_player_159",_text] call dayz_rollingMessages;
 			};
-
-			PVDZE_obj_Swap = [_objectCharacterID,_object,[_dir,_location, _vector],_classname,_obj,player];
+			if (DZE_permanentPlot) then {
+				_ownerID = _obj getVariable["ownerPUID","0"];
+				if (_ownerID == "0") then { _ownerID = [player] call FNC_GetPlayerUID; }; //APFL is on but UID is 0 so we will claim it to record the ownership.
+				_object setVariable ["ownerPUID",_ownerID,true];
+				PVDZE_obj_Swap = [_objectCharacterID,_object,[_dir,_location,_ownerID,_vector],_classname,_obj,player];
+			} else {
+				PVDZE_obj_Swap = [_objectCharacterID,_object,[_dir,_location,_vector],_classname,_obj,player];
+			};
 			publicVariableServer "PVDZE_obj_Swap";
 
 			player reveal _object;
@@ -150,4 +152,4 @@ if ((count _upgrade) > 0) then {
 };
 
 DZE_ActionInProgress = false;
-s_player_upgrade_build = -1;
\ No newline at end of file
+s_player_upgrade_build = -1;
diff --git a/SQF/dayz_code/credits.txt b/SQF/dayz_code/credits.txt
index e3192638c..ae49f8ca6 100644
--- a/SQF/dayz_code/credits.txt
+++ b/SQF/dayz_code/credits.txt
@@ -75,7 +75,7 @@ feature.
  * [Nick Chow] (https://github.com/Purplish)
  * bittedanke (https://github.com/bittedanke) - fixing a problem with chances.
  * ebaydayz (https://github.com/ebaydayz)
- * xyberviri (https://github.com/xyberviri) - ((action_open_backpack_0.ogg - action_open_backpack_4.ogg), (action_open_inventory_0.ogg - action_open_inventory_4.ogg)) Licesne Info - https://github.com/DayZMod/DayZ/issues/696
+ * xyberviri (https://github.com/xyberviri) - ((action_open_backpack_0.ogg - action_open_backpack_4.ogg), (action_open_inventory_0.ogg - action_open_inventory_4.ogg)) License Info - https://github.com/DayZMod/DayZ/issues/696
  
 ------------------------
 Art Work