diff --git a/CHANGELOG b/CHANGELOG
index cbce734b4..4040a00b6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,6 +13,7 @@ Current head (v.1.2 RC)
 - Bug-fixes and code improvements
     - [fitting] Use variadic template for basket extensions (#85)
     - [fitting] Fix current status issue (#108)
+    - [spatialPartitioning] Fix potential compilation issues in KnnGraph (#111) 
 
 -Docs
     - [fitting] Clarify documentation on FIT_RESULT (#108)
diff --git a/Ponca/src/SpatialPartitioning/KnnGraph/Query/knnGraphRangeQuery.h b/Ponca/src/SpatialPartitioning/KnnGraph/Query/knnGraphRangeQuery.h
index e2de75b13..4c62a118f 100644
--- a/Ponca/src/SpatialPartitioning/KnnGraph/Query/knnGraphRangeQuery.h
+++ b/Ponca/src/SpatialPartitioning/KnnGraph/Query/knnGraphRangeQuery.h
@@ -39,14 +39,14 @@ class KnnGraphRangeQuery : public RangeIndexQuery<typename Traits::IndexType, ty
 
 public:
     inline Iterator begin(){
-        KnnGraphRangeIterator it(this);
+        Iterator it(this);
         this->initialize(it);
         this->advance(it);
         return it;
     }
 
     inline Iterator end(){
-        return KnnGraphRangeIterator(this, m_graph->size());
+        return Iterator(this, m_graph->size());
     }
 
 protected:
diff --git a/Ponca/src/SpatialPartitioning/KnnGraph/knnGraph.h b/Ponca/src/SpatialPartitioning/KnnGraph/knnGraph.h
index 82db40629..4433dd36e 100644
--- a/Ponca/src/SpatialPartitioning/KnnGraph/knnGraph.h
+++ b/Ponca/src/SpatialPartitioning/KnnGraph/knnGraph.h
@@ -73,11 +73,11 @@ template <typename Traits> class KnnGraphBase
             : m_k(std::min(k,kdtree.index_count()-1)),
               m_kdTreePoints(kdtree.point_data())
     {
-        static_assert( std::is_same_v<typename Traits::DataPoint, typename KdTreeTraits::DataPoint>,
+        static_assert( std::is_same<typename Traits::DataPoint, typename KdTreeTraits::DataPoint>::value,
                        "KdTreeTraits::DataPoint is not equal to Traits::DataPoint" );
-        static_assert( std::is_same_v<typename Traits::PointContainer, typename KdTreeTraits::PointContainer>,
+        static_assert( std::is_same<typename Traits::PointContainer, typename KdTreeTraits::PointContainer>::value,
                        "KdTreeTraits::PointContainer is not equal to Traits::PointContainer" );
-        static_assert( std::is_same_v<typename Traits::IndexContainer, typename KdTreeTraits::IndexContainer>,
+        static_assert( std::is_same<typename Traits::IndexContainer, typename KdTreeTraits::IndexContainer>::value,
                        "KdTreeTraits::IndexContainer is not equal to Traits::IndexContainer" );
 
         // We need to account for the entire point set, irrespectively of the sampling. This is because the kdtree
@@ -107,7 +107,7 @@ template <typename Traits> class KnnGraphBase
     // Query -------------------------------------------------------------------
 public:
     inline KNearestIndexQuery k_nearest_neighbors(int index) const{
-        return KnnGraphKNearestQuery(this, index);
+        return KNearestIndexQuery(this, index);
     }
 
     inline RangeIndexQuery    range_neighbors(int index, Scalar r) const{