diff --git a/dayz_code/CfgMagazines.hpp b/dayz_code/CfgMagazines.hpp
index 540ebf45a..f89699271 100644
--- a/dayz_code/CfgMagazines.hpp
+++ b/dayz_code/CfgMagazines.hpp
@@ -89,7 +89,7 @@ class CfgMagazines {
 				text = $STR_ACTIONS_BUILD;
 				script = "spawn player_build;";
 				require = "ItemToolbox";
-				create = "Wire_cat1";
+				create = "Fort_RazorWire";
 			};
 		};
 	};
diff --git a/dayz_code/actions/trade_any_vehicle.sqf b/dayz_code/actions/trade_any_vehicle.sqf
index daf63c5c2..033a24ec6 100644
--- a/dayz_code/actions/trade_any_vehicle.sqf
+++ b/dayz_code/actions/trade_any_vehicle.sqf
@@ -43,7 +43,13 @@ if (_qty >= _qty_in) then {
 	
 			_dir = 90;	
 
-			_location = [(position player),0,20,1,0,20,0] call BIS_fnc_findSafePos;
+			
+			_helipad = nearestObjects [player, ["HeliHCivil"], 200];
+			if(count _helipad > 0) then {
+				_location = (getPosATL (_helipad select 0));	
+			} else {
+				_location = [(position player),0,20,1,0,20,0] call BIS_fnc_findSafePos;
+			}
 	
 			//place tent (local)
 			_veh = createVehicle [_part_out, _location, [], 0, "CAN_COLLIDE"];
diff --git a/dayz_server/init/server_functions.sqf b/dayz_server/init/server_functions.sqf
index 5ebaa38fb..139ba58e5 100644
--- a/dayz_server/init/server_functions.sqf
+++ b/dayz_server/init/server_functions.sqf
@@ -199,7 +199,7 @@ spawn_vehicles = {
 				} else {
 					// Spawn air anywhere that is flat
 					waitUntil{!isNil "BIS_fnc_selectRandom"};
-					_position = [MarkerPosition,0,DynamicVehicleArea,25,0,1,0] call BIS_fnc_findSafePos;
+					_position = [MarkerPosition,0,DynamicVehicleArea,10,0,2000,0] call BIS_fnc_findSafePos;
 					//diag_log("DEBUG: spawning air anywhere flat " + str(_position));
 				};