diff --git a/src/ifcgeom/AbstractKernel.h b/src/ifcgeom/AbstractKernel.h
index 54bf1f6abf..84fa069c7e 100644
--- a/src/ifcgeom/AbstractKernel.h
+++ b/src/ifcgeom/AbstractKernel.h
@@ -161,7 +161,7 @@ namespace {
 			if (kernel->partial_success_is_success) {
 				std::string created_from;
 				if (item->instance) {
-					created_from = " (created from " + item->instance->declaration().name() + ")";
+					created_from = " (created from " + item->instance.declaration().name() + ")";
 				}
 				logger::error("No support for " + ifcopenshell::geometry::taxonomy::kind_to_string(item->kind()) + created_from + " in kernel " + kernel->geometry_library());
 			}
@@ -187,7 +187,7 @@ namespace {
 			if (kernel->partial_success_is_success) {
 				std::string created_from;
 				if (item->instance) {
-					created_from = " (created from " + item->instance->declaration().name() + ")";
+					created_from = " (created from " + item->instance.declaration().name() + ")";
 				}
 				logger::error("No support (after considering item upgrade) for " + ifcopenshell::geometry::taxonomy::kind_to_string(item->kind()) + created_from + " in kernel " + kernel->geometry_library());
 			}
diff --git a/src/ifcgeom/kernels/opencascade/faceset_helper.cpp b/src/ifcgeom/kernels/opencascade/faceset_helper.cpp
index 392d30bccf..8963d8231d 100644
--- a/src/ifcgeom/kernels/opencascade/faceset_helper.cpp
+++ b/src/ifcgeom/kernels/opencascade/faceset_helper.cpp
@@ -171,12 +171,12 @@ IfcGeom::OpenCascadeKernel::faceset_helper::faceset_helper(
 				segments.push_back(std::make_pair(C, D));
 			});
 
-			if (edge_sets.find({loop->external.get_value_or(false), segment_set}) != edge_sets.end()) {
+			if (edge_sets.find({loop->external.value_or(false), segment_set}) != edge_sets.end()) {
 				duplicate_faces++;
 				duplicates_.insert(loop->identity());
 				continue;
 			}
-            edge_sets.insert({loop->external.get_value_or(false), segment_set});
+            edge_sets.insert({loop->external.value_or(false), segment_set});
 
 			if (segments.size() >= 3) {
 				for (auto& p : segments) {
diff --git a/src/ifcgeom/mapping/mapping.cpp b/src/ifcgeom/mapping/mapping.cpp
index a380274a50..9ac899e31a 100644
--- a/src/ifcgeom/mapping/mapping.cpp
+++ b/src/ifcgeom/mapping/mapping.cpp
@@ -197,7 +197,7 @@ std::vector<express::Base> mapping::find_openings(const express::Base& inst) {
                 // Only aggregation, not nesting is considered.
                 break;
             }
-            express::Base rel_obdef;
+            IfcSchema::IfcObjectDefinition rel_obdef;
             try {
                 rel_obdef = decomposes.front().as<IfcSchema::IfcRelAggregates>().RelatingObject();
             } catch (const std::exception&) {