diff --git a/src/ifcgeom/mapping/mapping.cpp b/src/ifcgeom/mapping/mapping.cpp
index 1f2118b557..bb6fee5b2d 100644
--- a/src/ifcgeom/mapping/mapping.cpp
+++ b/src/ifcgeom/mapping/mapping.cpp
@@ -452,22 +452,22 @@ namespace {
         std::vector<IfcSchema::IfcPresentationStyle> prs_styles;
 
 #ifdef SCHEMA_HAS_IfcStyleAssignmentSelect
-        auto style_assignments = si->Styles();
-        for (auto kt = style_assignments->begin(); kt != style_assignments->end(); ++kt) {
+        auto style_assignments = si.Styles();
+        for (auto kt = style_assignments.begin(); kt != style_assignments.end(); ++kt) {
             // Using IfcPresentationStyleAssignment is deprecated, use the direct assignment of a subtype of IfcPresentationStyle instead.
-            auto style_k = (*kt)->as<IfcSchema::IfcPresentationStyle>();
+            auto style_k = (*kt).as<IfcSchema::IfcPresentationStyle>();
             if (style_k) {
                 prs_styles.push_back(style_k);
                 continue;
             }
 
-            auto style_assignment = (*kt)->as<IfcSchema::IfcPresentationStyleAssignment>();
+            auto style_assignment = (*kt).as<IfcSchema::IfcPresentationStyleAssignment>();
             if (!style_assignment) {
                 continue;
             }
 
             // Only in case of 2x3 or old style IfcPresentationStyleAssignment
-            auto styles = style_assignment->Styles();
+            auto styles = style_assignment.Styles();
 #elif defined(SCHEMA_HAS_IfcPresentationStyleAssignment)
         std::vector<IfcSchema::IfcPresentationStyleAssignment> style_assignments = si.Styles();
         for (auto& style_assignment : style_assignments) {
diff --git a/src/svgfill/src/main.cpp b/src/svgfill/src/main.cpp
index 93ecfb6462..914c73d271 100644
--- a/src/svgfill/src/main.cpp
+++ b/src/svgfill/src/main.cpp
@@ -21,7 +21,6 @@
 #include "svgfill.h"
 #include "progress.h"
 
-#include <boost/optional.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 
@@ -35,7 +34,7 @@ int main(int argc, char** argv) {
 	bool valid_command_line = false;
 	bool random_color = false;
 	double eps = 1.e-5;
-	boost::optional<std::string> class_name;
+	std::optional<std::string> class_name;
 	
 	std::vector<std::string> flags;
 	std::vector<std::string> args;