Build fixes

lib/rmg/Zone.h

@@ -54,7 +54,8 @@ public:
 		return resourceRef + other;
 	}
 
-	T operator+(ThreadSafeProxy<T> & other)
+	template <typename U>
+	T operator+(ThreadSafeProxy<U> & other)
 	{
 		return get() + other.get();
 	}

lib/rmg/modificators/ObjectManager.cpp

@@ -614,7 +614,7 @@ void ObjectManager::placeObject(rmg::Object & object, bool guarded, bool updateD
 			}
 		}
 
-		for (auto id : sorted)
+		for (auto id : adjacentZones)
 		{
 			auto otherZone = map.getZones().at(id);
 			if ((otherZone->getType() == ETemplateZoneType::WATER) == (zone.getType()	== ETemplateZoneType::WATER))