diff --git a/source/RobotAPI/libraries/armem/server/wm/memory_definitions.h b/source/RobotAPI/libraries/armem/server/wm/memory_definitions.h
index cb4aa1a0cc5c00783de70a77986998f07c08902c..5d2036f054d287e90869de8c9d535dc694da9734 100644
--- a/source/RobotAPI/libraries/armem/server/wm/memory_definitions.h
+++ b/source/RobotAPI/libraries/armem/server/wm/memory_definitions.h
@@ -13,7 +13,6 @@
 #include <RobotAPI/libraries/armem/core/wm/detail/data_lookup_mixins.h>
 
 #include <mutex>
-#include <optional>
 
 
 namespace armarx::armem::server::wm
diff --git a/source/RobotAPI/libraries/armem_objects/server/class/Segment.cpp b/source/RobotAPI/libraries/armem_objects/server/class/Segment.cpp
index aac9200bc90353c61319e506e34e8e9017d6d445..ed941f1223dc617896c13118c237144bdf71d011 100644
--- a/source/RobotAPI/libraries/armem_objects/server/class/Segment.cpp
+++ b/source/RobotAPI/libraries/armem_objects/server/class/Segment.cpp
@@ -124,7 +124,7 @@ namespace armarx::armem::server::obj::clazz
         {
             try
             {
-                std::optional<arondto::ObjectClass> aron = coreSegment->doLocked([&coreSegment, &entity]()
+                std::optional<arondto::ObjectClass> aron = coreSegment->doLocked([this, &entity]()
                 {
                     return coreSegment->findLatestInstanceDataAs<arondto::ObjectClass>(entityID, 0);
                 });