diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map.h b/Combinatorial_map/include/CGAL/Combinatorial_map.h
index bdc79e165c4..327e33728c7 100644
--- a/Combinatorial_map/include/CGAL/Combinatorial_map.h
+++ b/Combinatorial_map/include/CGAL/Combinatorial_map.h
@@ -245,7 +245,7 @@ namespace CGAL {
       {
         dartmap[it]=mdarts.emplace();
         init_dart(dartmap[it], amap.get_marks(it));
-        internal::Copy_dart_info_functor::run
+        internal::Copy_dart_info_functor<CMap2, Refs>::run
             (amap, static_cast<Refs&>(*this), it, dartmap[it],
              dartinfoconverter);
       }
@@ -3570,8 +3570,8 @@ namespace CGAL {
             it!=darts().end(); ++it)
       {
         dual[it] = amap.create_dart();
-        internal::Copy_dart_info_functor::run(amap, static_cast<Refs&>(*this),
-                                              it, dual[it]);
+        internal::Copy_dart_info_functor<Refs, Refs>::
+          run(amap, static_cast<Refs&>(*this), it, dual[it]);
         if ( it==adart && res==amap.null_handle ) res = dual[it];
       }
 
diff --git a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_copy_functors.h b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_copy_functors.h
index f175441083f..2726f23df1f 100644
--- a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_copy_functors.h
+++ b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_copy_functors.h
@@ -392,12 +392,11 @@ struct Copy_dart_info_functor_if_nonvoid<Map1, Map2, DartInfoConverter,
 // ****************************************************************************
 /// Copy non void information of dart from one cmap to other.
 /// Map1 is the existing map, to copy into map2.
+template<typename Map1, typename Map2,
+         typename DartInfoConverter=CGAL::Default_converter_dart_info<Map1, Map2> >
 struct Copy_dart_info_functor
 {
-  template<typename Map1, typename Map2,
-           typename DartInfoConverter=CGAL::Default_converter_dart_info<Map1, Map2> >
-  static void run( const Map1& cmap1,
-                   Map2& cmap2,
+  static void run( const Map1& cmap1, Map2& cmap2,
                    typename Map1::Dart_const_handle dh1,
                    typename Map2::Dart_handle dh2,
                    const DartInfoConverter& converter=DartInfoConverter())
diff --git a/Generalized_map/include/CGAL/Generalized_map.h b/Generalized_map/include/CGAL/Generalized_map.h
index b37a5b79b6c..d6584a2aa9e 100644
--- a/Generalized_map/include/CGAL/Generalized_map.h
+++ b/Generalized_map/include/CGAL/Generalized_map.h
@@ -222,9 +222,9 @@ namespace CGAL {
       {
         dartmap[it]=mdarts.emplace();
         init_dart(dartmap[it], amap.get_marks(it));
-        internal::Copy_dart_info_functor::run
-            (amap, static_cast<Refs&>(*this), it, dartmap[it],
-             dartinfoconverter);
+        internal::Copy_dart_info_functor<GMap2, Refs>::
+          run(amap, static_cast<Refs&>(*this), it, dartmap[it],
+              dartinfoconverter);
       }
 
       unsigned int min_dim=(dimension<amap.dimension?dimension:amap.dimension);
@@ -2743,8 +2743,8 @@ namespace CGAL {
             it!=darts().end(); ++it)
       {
         dual[it] = amap.create_dart();
-        internal::Copy_dart_info_functor::run(amap, static_cast<Refs&>(*this),
-                                              it, dual[it]);
+        internal::Copy_dart_info_functor<Refs, Refs>::
+          run(amap, static_cast<Refs&>(*this), it, dual[it]);
         if ( it==adart && res==amap.null_handle ) res = dual[it];
       }
 
diff --git a/Linear_cell_complex/examples/Linear_cell_complex/CMakeLists.txt b/Linear_cell_complex/examples/Linear_cell_complex/CMakeLists.txt
index b110a7951d1..b3681c6d59e 100644
--- a/Linear_cell_complex/examples/Linear_cell_complex/CMakeLists.txt
+++ b/Linear_cell_complex/examples/Linear_cell_complex/CMakeLists.txt
@@ -11,8 +11,8 @@ endif()
 # If you want to visualize a linear cell complex, you can use the following viewer
 # based on qt. Just uncomment the following two lines, plus the lines qt5_use_modules below
 
-find_package(CGAL COMPONENTS Qt5)
-include("CMakeLCCViewerQt.inc")
+# find_package(CGAL COMPONENTS Qt5)
+# include("CMakeLCCViewerQt.inc")
 
 # If you don't want to visualize, use the following line (otherwise comment it)
 find_package(CGAL QUIET)
@@ -43,19 +43,19 @@ if ( CGAL_FOUND )
   add_executable(voronoi_2 voronoi_2.cpp)
   target_link_libraries(voronoi_2 ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES}
                                   ${MAP_VIEWER_LIBRARIES})
-  qt5_use_modules(voronoi_2 ${MAP_VIEWER_MODULES})
+#  qt5_use_modules(voronoi_2 ${MAP_VIEWER_MODULES})
 
   add_executable(voronoi_3 voronoi_3.cpp)
   target_link_libraries(voronoi_3 ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES}
                                   ${MAP_VIEWER_LIBRARIES})
-  qt5_use_modules(voronoi_3 ${MAP_VIEWER_MODULES})
+#  qt5_use_modules(voronoi_3 ${MAP_VIEWER_MODULES})
 
   create_single_source_cgal_program( "gmap_linear_cell_complex_3.cpp" )
 
   add_executable(linear_cell_complex_3_operations linear_cell_complex_3_operations.cpp)
   target_link_libraries(linear_cell_complex_3_operations ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES}
                                   ${MAP_VIEWER_LIBRARIES})
-  qt5_use_modules(linear_cell_complex_3_operations ${MAP_VIEWER_MODULES})
+#  qt5_use_modules(linear_cell_complex_3_operations ${MAP_VIEWER_MODULES})
   
   
 else()