diff --git a/lib/Terrain.cpp b/lib/Terrain.cpp
index b6f399d12..ea42f3774 100644
--- a/lib/Terrain.cpp
+++ b/lib/Terrain.cpp
@@ -194,7 +194,7 @@ void TerrainTypeHandler::initTerrains(const std::vector<std::string> & allConfig
 	for(size_t i = Terrain::FIRST_REGULAR_TERRAIN; i < Terrain::ORIGINAL_TERRAIN_COUNT; i++)
 	{
 		//Make sure that original terrains are loaded
-		assert(objects(i).id != Terrain::WRONG);
+		assert(objects[i].id != Terrain::WRONG);
 	}
 
 	recreateTerrainMaps();
diff --git a/lib/mapObjects/ObjectTemplate.cpp b/lib/mapObjects/ObjectTemplate.cpp
index a23b3db36..9caec2379 100644
--- a/lib/mapObjects/ObjectTemplate.cpp
+++ b/lib/mapObjects/ObjectTemplate.cpp
@@ -157,7 +157,7 @@ void ObjectTemplate::readTxt(CLegacyConfigParser & parser)
 	// so these two fields can be interpreted as "strong affinity" and "weak affinity" towards terrains
 	std::string & terrStr = strings[4]; // allowed terrains, 1 = object can be placed on this terrain
 
-	assert(terrStr.size() == Terrain::ROCK - 1); // all terrains but rock
+	assert(terrStr.size() == Terrain::ROCK); // all terrains but rock - counting from 0
 	for(TerrainId i = Terrain::FIRST_REGULAR_TERRAIN; i < Terrain::ROCK; i++)
 	{
 		if (terrStr[8-i] == '1')
diff --git a/lib/rmg/WaterProxy.cpp b/lib/rmg/WaterProxy.cpp
index 8405a7640..84f62cf93 100644
--- a/lib/rmg/WaterProxy.cpp
+++ b/lib/rmg/WaterProxy.cpp
@@ -43,7 +43,7 @@ void WaterProxy::process()
 	for(auto & t : zone.area().getTilesVector())
 	{
 		assert(map.isOnMap(t));
-		assert(map.map().getTile(t).terType == zone.getTerrainType());
+		assert(map.map().getTile(t).terType->id == zone.getTerrainType());
 	}
 	
 	for(auto z : map.getZones())