diff --git a/lib/rmg/RmgMap.cpp b/lib/rmg/RmgMap.cpp
index cdf8e0bb0..a8c15174b 100644
--- a/lib/rmg/RmgMap.cpp
+++ b/lib/rmg/RmgMap.cpp
@@ -309,7 +309,7 @@ void RmgMap::setZoneID(const int3& tile, TRmgTemplateZoneId zid)
 	zoneColouring[tile.x][tile.y][tile.z] = zid;
 }
 
-void RmgMap::setNearestObjectDistance(int3 &tile, float value)
+void RmgMap::setNearestObjectDistance(const int3 &tile, float value)
 {
 	assertOnMap(tile);
 	
diff --git a/lib/rmg/RmgMap.h b/lib/rmg/RmgMap.h
index 11213d031..27f78ed56 100644
--- a/lib/rmg/RmgMap.h
+++ b/lib/rmg/RmgMap.h
@@ -61,7 +61,7 @@ public:
 	TerrainTile & getTile(const int3 & tile) const;
 		
 	float getNearestObjectDistance(const int3 &tile) const;
-	void setNearestObjectDistance(int3 &tile, float value);
+	void setNearestObjectDistance(const int3 &tile, float value);
 	
 	TRmgTemplateZoneId getZoneID(const int3& tile) const;
 	void setZoneID(const int3& tile, TRmgTemplateZoneId zid);
diff --git a/lib/rmg/RmgPath.cpp b/lib/rmg/RmgPath.cpp
index 6bd0ec6b3..134f08267 100644
--- a/lib/rmg/RmgPath.cpp
+++ b/lib/rmg/RmgPath.cpp
@@ -68,11 +68,12 @@ Path Path::search(const Tileset & dst, bool straight, std::function<float(const
 	if(!dArea)
 		return Path::invalid();
 	
+	if(dst.empty()) // Skip construction of same area
+		return Path(*dArea);
+
 	auto resultArea = *dArea + dst;
 	Path result(resultArea);
-	if(dst.empty())
-		return result;
-	
+
 	int3 src = rmg::Area(dst).nearest(dPath);
 	result.connect(src);