diff --git a/src/geometry/initializer/BoundaryFromMesh.h b/src/geometry/initializer/BoundaryFromMesh.h
index e0060d328e022eb3c90da1496591ad96892d9adf..858ba0389c3808d170c352a9d2345d9cf55d7896 100644
--- a/src/geometry/initializer/BoundaryFromMesh.h
+++ b/src/geometry/initializer/BoundaryFromMesh.h
@@ -64,8 +64,8 @@ public:
                      shared_ptr<mesh::DistanceOctree<Mesh_T>> distanceOctree,
                      const uint_t numGhostLayers );
 
-   void init( mesh::ColorToBoundaryMapper<Mesh_T> & colorToBoundaryMapper,
-              FlagUID fluidFlagID );
+   void init( const mesh::ColorToBoundaryMapper<Mesh_T> & colorToBoundaryMapper,
+              const FlagUID fluidFlagID );
 
    void init( BlockStorage & blockStorage, const Config::BlockHandle & blockHandle ) override;
 
diff --git a/src/geometry/initializer/BoundaryFromMesh.impl.h b/src/geometry/initializer/BoundaryFromMesh.impl.h
index 977aeef236441095790dcba337ab2a97b643c296..58dffdb8d32a95222bc63660ccc2b463162dd6cb 100644
--- a/src/geometry/initializer/BoundaryFromMesh.impl.h
+++ b/src/geometry/initializer/BoundaryFromMesh.impl.h
@@ -32,7 +32,6 @@ namespace initializer {
 
 namespace internal {
 
-// TODO: move this to central place
 //**********************************************************************************************************************
 /*! A small helper class that makes it possible to use mesh::boundary::BoundarySetup
 *   to operate directly on the flag field instead of on a boundary handling.
@@ -141,18 +140,18 @@ BoundaryFromMesh<FlagField_T, Mesh_T>::BoundaryFromMesh(
 //*******************************************************************************************************************
 template<typename FlagField_T, typename Mesh_T>
 void BoundaryFromMesh<FlagField_T, Mesh_T>::init(
-   mesh::ColorToBoundaryMapper<Mesh_T> & colorToBoundaryMapper,
-   FlagUID fluidFlagID )
+   const mesh::ColorToBoundaryMapper<Mesh_T> & colorToBoundaryMapper,
+   const FlagUID fluidFlagID )
 {
    using namespace internal;
 
-   boundarySetup_.setFlag<FlagField_T>(flagFieldID_, fluidFlagID, mesh::BoundarySetup::OUTSIDE);
+   boundarySetup_.setFlag<FlagField_T>( flagFieldID_, fluidFlagID, mesh::BoundarySetup::OUTSIDE );
 
-   boundaryLocation_ = colorToBoundaryMapper.addBoundaryInfoToMesh(*mesh_);
+   boundaryLocation_ = colorToBoundaryMapper.addBoundaryInfoToMesh( *mesh_ );
 
    boundarySetup_.setBoundaries<FlagFieldBoundaryHandling<FlagField_T>>(
       flagFieldBoundarHandlingID_,
-      makeBoundaryLocationFunction(distanceOctree_, boundaryLocation_),
+      makeBoundaryLocationFunction( distanceOctree_, boundaryLocation_ ),
       mesh::BoundarySetup::INSIDE );
 }
 
@@ -160,8 +159,8 @@ template<typename FlagField_T, typename Mesh_T>
 void BoundaryFromMesh<FlagField_T, Mesh_T>::init(
    BlockStorage &, const Config::BlockHandle & blockHandle )
 {
-   mesh::ColorToBoundaryMapper< Mesh_T > colorToBoundaryMapper{ blockHandle.getBlock( "ColorToBoundaryMapper") };
-   FlagUID fluidFlag = FlagUID{ blockHandle.getParameter< std::string >( "fluidFlag") };
+   mesh::ColorToBoundaryMapper< Mesh_T > colorToBoundaryMapper{ blockHandle.getBlock( "ColorToBoundaryMapper" ) };
+   FlagUID fluidFlag = FlagUID{ blockHandle.getParameter< std::string >( "fluidFlag" ) };
 
    init( colorToBoundaryMapper, fluidFlag );
 }
diff --git a/src/mesh/boundary/ColorToBoundaryMapper.h b/src/mesh/boundary/ColorToBoundaryMapper.h
index c6ba36e6f2fe58f96a2b820f62a83214d16d941a..4731a67fd53cad5b45cb6dcf9db5081e0d9382df 100644
--- a/src/mesh/boundary/ColorToBoundaryMapper.h
+++ b/src/mesh/boundary/ColorToBoundaryMapper.h
@@ -26,6 +26,7 @@
 #include "core/config/Config.h"
 #include "core/DataTypes.h"
 #include "core/debug/CheckFunctions.h"
+#include "core/math/Vector3.h"
 
 #include <map>