diff --git a/src/openrct2/actions/MazeSetTrackAction.hpp b/src/openrct2/actions/MazeSetTrackAction.hpp
index dc05b8a3d2..222ab75341 100644
--- a/src/openrct2/actions/MazeSetTrackAction.hpp
+++ b/src/openrct2/actions/MazeSetTrackAction.hpp
@@ -94,7 +94,7 @@ public:
             return res;
         }
 
-        if (!map_is_location_owned({ _loc.x, _loc.y, _loc.z }) && !gCheatsSandboxMode)
+        if (!map_is_location_owned(_loc) && !gCheatsSandboxMode)
         {
             res->Error = GA_ERROR::NOT_OWNED;
             res->ErrorMessage = STR_LAND_NOT_OWNED_BY_PARK;
diff --git a/src/openrct2/actions/WallRemoveAction.hpp b/src/openrct2/actions/WallRemoveAction.hpp
index 64dec348b9..9fff1fa160 100644
--- a/src/openrct2/actions/WallRemoveAction.hpp
+++ b/src/openrct2/actions/WallRemoveAction.hpp
@@ -51,8 +51,7 @@ public:
         }
 
         const bool isGhost = GetFlags() & GAME_COMMAND_FLAG_GHOST;
-        if (!isGhost && !(gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) && !gCheatsSandboxMode
-            && !map_is_location_owned({ _loc.x, _loc.y, _loc.z }))
+        if (!isGhost && !(gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) && !gCheatsSandboxMode && !map_is_location_owned(_loc))
         {
             return std::make_unique<GameActionResult>(GA_ERROR::NOT_OWNED, STR_CANT_REMOVE_THIS, STR_LAND_NOT_OWNED_BY_PARK);
         }
diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp
index e807d4471e..f7f593796f 100644
--- a/src/openrct2/peep/Peep.cpp
+++ b/src/openrct2/peep/Peep.cpp
@@ -773,15 +773,11 @@ bool Peep::Place(TileCoordsXYZ location, bool apply)
     if (!tileElement)
         return false;
 
-    CoordsXYZ destination = { location.x * 32, location.y * 32, location.z * 8 };
-
     // Set the coordinate of destination to be exactly
     // in the middle of a tile.
-    destination.x += 16;
-    destination.y += 16;
-    destination.z = tileElement->base_height * 8 + 16;
+    CoordsXYZ destination = { location.x * 32 + 16, location.y * 32 + 16, tileElement->base_height * 8 + 16 };
 
-    if (!map_is_location_owned({ location.x * 32, location.y * 32, destination.z }))
+    if (!map_is_location_owned(destination))
     {
         gGameCommandErrorTitle = STR_ERR_CANT_PLACE_PERSON_HERE;
         return false;
diff --git a/src/openrct2/world/Map.cpp b/src/openrct2/world/Map.cpp
index 91e1147909..1ef78f8422 100644
--- a/src/openrct2/world/Map.cpp
+++ b/src/openrct2/world/Map.cpp
@@ -1606,6 +1606,43 @@ void map_remove_out_of_range_elements()
     }
 }
 
+static void map_extend_boundary_surface_extend_tile(const SurfaceElement& sourceTile, SurfaceElement& destTile)
+{
+    destTile.SetSurfaceStyle(sourceTile.GetSurfaceStyle());
+    destTile.SetEdgeStyle(sourceTile.GetEdgeStyle());
+    destTile.SetGrassLength(sourceTile.GetGrassLength());
+    destTile.SetOwnership(OWNERSHIP_UNOWNED);
+    destTile.SetWaterHeight(sourceTile.GetWaterHeight());
+
+    auto z = sourceTile.base_height;
+    auto slope = sourceTile.GetSlope() & TILE_ELEMENT_SLOPE_NW_SIDE_UP;
+    if (slope == TILE_ELEMENT_SLOPE_NW_SIDE_UP)
+    {
+        z += 2;
+        slope = TILE_ELEMENT_SLOPE_FLAT;
+        if (sourceTile.GetSlope() & TILE_ELEMENT_SLOPE_DOUBLE_HEIGHT)
+        {
+            slope = TILE_ELEMENT_SLOPE_N_CORNER_UP;
+            if (sourceTile.GetSlope() & TILE_ELEMENT_SLOPE_S_CORNER_UP)
+            {
+                slope = TILE_ELEMENT_SLOPE_W_CORNER_UP;
+                if (sourceTile.GetSlope() & TILE_ELEMENT_SLOPE_E_CORNER_UP)
+                {
+                    slope = TILE_ELEMENT_SLOPE_FLAT;
+                }
+            }
+        }
+    }
+    if (slope & TILE_ELEMENT_SLOPE_N_CORNER_UP)
+        slope |= TILE_ELEMENT_SLOPE_E_CORNER_UP;
+    if (slope & TILE_ELEMENT_SLOPE_W_CORNER_UP)
+        slope |= TILE_ELEMENT_SLOPE_S_CORNER_UP;
+
+    destTile.SetSlope(slope);
+    destTile.base_height = z;
+    destTile.clearance_height = z;
+}
+
 /**
  * Copies the terrain and slope from the edge of the map to the new tiles. Used when increasing the size of the map.
  *  rct2: 0x0068AC15
@@ -1613,46 +1650,18 @@ void map_remove_out_of_range_elements()
 void map_extend_boundary_surface()
 {
     SurfaceElement *existingTileElement, *newTileElement;
-    int32_t x, y, z, slope;
+    int32_t x, y;
 
     y = gMapSize - 2;
     for (x = 0; x < MAXIMUM_MAP_SIZE_TECHNICAL; x++)
     {
         existingTileElement = map_get_surface_element_at(x, y - 1);
         newTileElement = map_get_surface_element_at(x, y);
-        newTileElement->SetSurfaceStyle(existingTileElement->GetSurfaceStyle());
-        newTileElement->SetEdgeStyle(existingTileElement->GetEdgeStyle());
-        newTileElement->SetGrassLength(existingTileElement->GetGrassLength());
-        newTileElement->SetOwnership(OWNERSHIP_UNOWNED);
-        newTileElement->SetWaterHeight(existingTileElement->GetWaterHeight());
 
-        z = existingTileElement->base_height;
-        slope = existingTileElement->GetSlope() & TILE_ELEMENT_SLOPE_NW_SIDE_UP;
-        if (slope == TILE_ELEMENT_SLOPE_NW_SIDE_UP)
+        if (existingTileElement && newTileElement)
         {
-            z += 2;
-            slope = TILE_ELEMENT_SLOPE_FLAT;
-            if (existingTileElement->GetSlope() & TILE_ELEMENT_SLOPE_DOUBLE_HEIGHT)
-            {
-                slope = TILE_ELEMENT_SLOPE_N_CORNER_UP;
-                if (existingTileElement->GetSlope() & TILE_ELEMENT_SLOPE_S_CORNER_UP)
-                {
-                    slope = TILE_ELEMENT_SLOPE_W_CORNER_UP;
-                    if (existingTileElement->GetSlope() & TILE_ELEMENT_SLOPE_E_CORNER_UP)
-                    {
-                        slope = TILE_ELEMENT_SLOPE_FLAT;
-                    }
-                }
-            }
+            map_extend_boundary_surface_extend_tile(*existingTileElement, *newTileElement);
         }
-        if (slope & TILE_ELEMENT_SLOPE_N_CORNER_UP)
-            slope |= TILE_ELEMENT_SLOPE_E_CORNER_UP;
-        if (slope & TILE_ELEMENT_SLOPE_W_CORNER_UP)
-            slope |= TILE_ELEMENT_SLOPE_S_CORNER_UP;
-
-        newTileElement->SetSlope(slope);
-        newTileElement->base_height = z;
-        newTileElement->clearance_height = z;
 
         update_park_fences({ x << 5, y << 5 });
     }
@@ -1663,39 +1672,10 @@ void map_extend_boundary_surface()
         existingTileElement = map_get_surface_element_at(x - 1, y);
         newTileElement = map_get_surface_element_at(x, y);
 
-        newTileElement->SetSurfaceStyle(existingTileElement->GetSurfaceStyle());
-        newTileElement->SetEdgeStyle(existingTileElement->GetEdgeStyle());
-        newTileElement->SetGrassLength(existingTileElement->GetGrassLength());
-        newTileElement->SetOwnership(OWNERSHIP_UNOWNED);
-        newTileElement->SetWaterHeight(existingTileElement->GetWaterHeight());
-
-        z = existingTileElement->base_height;
-        slope = existingTileElement->GetSlope() & TILE_ELEMENT_SLOPE_NE_SIDE_UP;
-        if (slope == TILE_ELEMENT_SLOPE_NE_SIDE_UP)
+        if (existingTileElement && newTileElement)
         {
-            z += 2;
-            slope = TILE_ELEMENT_SLOPE_FLAT;
-            if (existingTileElement->GetSlope() & TILE_ELEMENT_SLOPE_DOUBLE_HEIGHT)
-            {
-                slope = TILE_ELEMENT_SLOPE_N_CORNER_UP;
-                if (existingTileElement->GetSlope() & TILE_ELEMENT_SLOPE_S_CORNER_UP)
-                {
-                    slope = TILE_ELEMENT_SLOPE_E_CORNER_UP;
-                    if (existingTileElement->GetSlope() & TILE_ELEMENT_SLOPE_W_CORNER_UP)
-                    {
-                        slope = TILE_ELEMENT_SLOPE_FLAT;
-                    }
-                }
-            }
+            map_extend_boundary_surface_extend_tile(*existingTileElement, *newTileElement);
         }
-        if (slope & TILE_ELEMENT_SLOPE_N_CORNER_UP)
-            slope |= TILE_ELEMENT_SLOPE_W_CORNER_UP;
-        if (slope & TILE_ELEMENT_SLOPE_E_CORNER_UP)
-            slope |= TILE_ELEMENT_SLOPE_S_CORNER_UP;
-
-        newTileElement->SetSlope(slope);
-        newTileElement->base_height = z;
-        newTileElement->clearance_height = z;
 
         update_park_fences({ x << 5, y << 5 });
     }