diff --git a/generators/graph/voxel_graph_node_db.cpp b/generators/graph/voxel_graph_node_db.cpp
index d40d4cc1..e4eb87fe 100644
--- a/generators/graph/voxel_graph_node_db.cpp
+++ b/generators/graph/voxel_graph_node_db.cpp
@@ -2163,11 +2163,11 @@ VoxelGraphNodeDB::VoxelGraphNodeDB() {
 
 	for (unsigned int i = 0; i < _types.size(); ++i) {
 		NodeType &t = _types[i];
-		_type_name_to_id.set(t.name, (VoxelGeneratorGraph::NodeTypeID)i);
+		_type_name_to_id.insert(t.name, (VoxelGeneratorGraph::NodeTypeID)i);
 
 		for (size_t param_index = 0; param_index < t.params.size(); ++param_index) {
 			Param &p = t.params[param_index];
-			t.param_name_to_index.set(p.name, param_index);
+			t.param_name_to_index.insert(p.name, param_index);
 			p.index = param_index;
 
 			switch (p.type) {
@@ -2195,7 +2195,7 @@ VoxelGraphNodeDB::VoxelGraphNodeDB() {
 
 		for (size_t input_index = 0; input_index < t.inputs.size(); ++input_index) {
 			const Port &p = t.inputs[input_index];
-			t.input_name_to_index.set(p.name, input_index);
+			t.input_name_to_index.insert(p.name, input_index);
 		}
 
 		if (t.expression_func != nullptr) {
diff --git a/meshers/blocky/voxel_blocky_model.cpp b/meshers/blocky/voxel_blocky_model.cpp
index 30aca333..7c127c9b 100644
--- a/meshers/blocky/voxel_blocky_model.cpp
+++ b/meshers/blocky/voxel_blocky_model.cpp
@@ -393,7 +393,7 @@ static void bake_mesh_geometry(VoxelBlockyModel &config, VoxelBlockyModel::Baked
 							}
 						}
 
-						added_side_indices[side].set(src_index, next_side_index);
+						added_side_indices[side].insert(src_index, next_side_index);
 						++next_side_index;
 
 					} else {
@@ -435,7 +435,7 @@ static void bake_mesh_geometry(VoxelBlockyModel &config, VoxelBlockyModel::Baked
 							}
 						}
 
-						added_regular_indices.set(src_index, next_regular_index);
+						added_regular_indices.insert(src_index, next_regular_index);
 						++next_regular_index;
 
 					} else {
diff --git a/terrain/fixed_lod/voxel_terrain.cpp b/terrain/fixed_lod/voxel_terrain.cpp
index 474f755c..7648d80f 100644
--- a/terrain/fixed_lod/voxel_terrain.cpp
+++ b/terrain/fixed_lod/voxel_terrain.cpp
@@ -377,9 +377,10 @@ void VoxelTerrain::set_block_enter_notification_enabled(bool enable) {
 
 	if (enable == false) {
 		const Vector3i *key = nullptr;
-		while ((key = _loading_blocks.next(key))) {
-			LoadingBlock *lb = _loading_blocks.getptr(*key);
-			CRASH_COND(lb == nullptr);
+		
+		for (auto elm = _loading_blocks.begin(); elm < _loading_blocks.end(); ++elm) {
+			LoadingBlock *lb = _loading_blocks.getptr(elm->key);
+			CRASH_COND(elm == nullptr);
 			lb->viewers_to_notify.clear();
 		}
 	}
@@ -486,7 +487,7 @@ void VoxelTerrain::view_data_block(Vector3i bpos, uint32_t viewer_id, bool requi
 			}
 
 			// Schedule a loading request
-			_loading_blocks.set(bpos, new_loading_block);
+			_loading_blocks.insert(bpos, new_loading_block);
 			_blocks_pending_load.push_back(bpos);
 
 		} else {
@@ -800,7 +801,7 @@ void VoxelTerrain::generate_block_async(Vector3i block_position) {
 
 	// Schedule a loading request
 	// TODO This could also end up loading from stream
-	_loading_blocks.set(block_position, new_loading_block);
+	_loading_blocks.insert(block_position, new_loading_block);
 	_blocks_pending_load.push_back(block_position);
 }
 
diff --git a/terrain/instancing/voxel_instancer.cpp b/terrain/instancing/voxel_instancer.cpp
index 9eaef63d..8bbcbdcb 100644
--- a/terrain/instancing/voxel_instancer.cpp
+++ b/terrain/instancing/voxel_instancer.cpp
@@ -1611,7 +1611,7 @@ Node *VoxelInstancer::debug_dump_as_nodes() const {
 				Ref<Mesh> mesh_copy;
 				if (mesh_copy_ptr == nullptr) {
 					mesh_copy = src_mesh->duplicate();
-					mesh_copies.set(src_mesh, mesh_copy);
+					mesh_copies.insert(src_mesh, mesh_copy);
 				} else {
 					mesh_copy = *mesh_copy_ptr;
 				}
diff --git a/util/godot/funcs.cpp b/util/godot/funcs.cpp
index cc09a118..688fd609 100644
--- a/util/godot/funcs.cpp
+++ b/util/godot/funcs.cpp
@@ -137,14 +137,14 @@ Array generate_debug_seams_wireframe_surface(const Mesh &src_mesh, int surface_i
 			const Vector3 pos = src_positions[i];
 			Dupe *dptr = vertex_to_dupe.getptr(pos);
 			if (dptr == nullptr) {
-				vertex_to_dupe.set(pos, Dupe());
+				vertex_to_dupe.insert(pos, Dupe());
 			} else {
 				if (dptr->count == 0) {
 					dptr->dst_index = dst_positions.size();
 					dst_positions.push_back(pos + src_normals[i] * 0.05);
 				}
 				++dptr->count;
-				src_index_to_dst_index.set(i, dptr->dst_index);
+				src_index_to_dst_index.insert(i, dptr->dst_index);
 			}
 		}
 	}