diff --git a/CMakeLists.txt b/CMakeLists.txt
index 831e6e87650..3ed3d57562f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -348,6 +348,7 @@ endif()
 if(ACTS_BUILD_PLUGIN_GEOMODEL)
   if(ACTS_USE_SYSTEM_GEOMODEL)
     message(STATUS "Using system installation of GeoModel")
+    find_package(GeoModelIO ${_acts_geomodel_version} COMPONENTS GeoModelDBManager GeoModelRead REQUIRED CONFIG)
     find_package(GeoModelCore ${_acts_geomodel_version} COMPONENTS GeoModelKernel REQUIRED CONFIG)
   else()
     add_subdirectory(thirdparty/GeoModel)
diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelTree.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelTree.hpp
index 224e0f786ed..1d3ba02e43f 100644
--- a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelTree.hpp
+++ b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelTree.hpp
@@ -18,7 +18,7 @@ namespace Acts {
 
 struct GeoModelTree {
   std::shared_ptr<GeoModelIO::ReadGeoModel> geoReader = nullptr;
-  GeoVPhysVol* worldVolume = nullptr;
+  const GeoVPhysVol* worldVolume = nullptr;
   std::string worldVolumeName = "World";
 };
 }  // namespace Acts
diff --git a/Plugins/GeoModel/src/GeoModelToDetVol.cpp b/Plugins/GeoModel/src/GeoModelToDetVol.cpp
index 1e772515166..daa6b8416e1 100644
--- a/Plugins/GeoModel/src/GeoModelToDetVol.cpp
+++ b/Plugins/GeoModel/src/GeoModelToDetVol.cpp
@@ -9,7 +9,7 @@
 #include "Acts/Plugins/GeoModel/GeoModelToDetVol.hpp"
 
 #include "Acts/Detector/PortalGenerators.hpp"
-#include "Acts/Navigation/SurfaceCandidatesUpdaters.hpp"
+#include "Acts/Navigation/InternalNavigation.hpp"
 
 #include <GeoModelKernel/GeoBox.h>
 #include <GeoModelKernel/GeoPcon.h>