diff --git a/Polyhedron/demo/Polyhedron/MainWindow.cpp b/Polyhedron/demo/Polyhedron/MainWindow.cpp
index 33bc739653b..50608feda33 100644
--- a/Polyhedron/demo/Polyhedron/MainWindow.cpp
+++ b/Polyhedron/demo/Polyhedron/MainWindow.cpp
@@ -1855,12 +1855,12 @@ void MainWindow::on_actionPreferences_triggered()
           viewer, SLOT(setFastDrawing(bool)));
   prefdiag.max_itemsSpinBox->setValue(viewer->textRenderer()->getMax_textItems());
   
-  connect(prefdiag.max_itemsSpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
+  connect(prefdiag.max_itemsSpinBox,static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged),
           this, [this](int i){
     setMaxTextItemsDisplayed(i);
   });
   prefdiag.transpSpinBox->setValue(viewer->total_pass());
-  connect(prefdiag.transpSpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
+  connect(prefdiag.transpSpinBox, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged),
               this, [this](int i)
   {
     setTransparencyPasses(i);
@@ -1877,14 +1877,14 @@ void MainWindow::on_actionPreferences_triggered()
   prefdiag.surface_meshComboBox->setCurrentText(CGAL::Three::Three::modeName(
                                                   CGAL::Three::Three::s_defaultSMRM));
   connect(prefdiag.surface_meshComboBox, &QComboBox::currentTextChanged,
-          this, [](const QString& text){
+          this, [this](const QString& text){
     CGAL::Three::Three::s_defaultSMRM = CGAL::Three::Three::modeFromName(text);
   });
   
   prefdiag.point_setComboBox->setCurrentText(CGAL::Three::Three::modeName(
                                                CGAL::Three::Three::s_defaultPSRM));
   connect(prefdiag.point_setComboBox, &QComboBox::currentTextChanged,
-          this, [](const QString& text){
+          this, [this](const QString& text){
     CGAL::Three::Three::s_defaultPSRM = CGAL::Three::Three::modeFromName(text);
   });
   std::vector<QTreeWidgetItem*> items;
diff --git a/Polyhedron/demo/Polyhedron/Plugins/Display/Display_property_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Display/Display_property_plugin.cpp
index 6dab8378c56..e151ba4c68d 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/Display/Display_property_plugin.cpp
+++ b/Polyhedron/demo/Polyhedron/Plugins/Display/Display_property_plugin.cpp
@@ -7,6 +7,7 @@
 #include <QColorDialog>
 #include <QPalette>
 #include <QColor>
+#include <QMessageBox>
 #include "Messages_interface.h"
 #include "Scene_surface_mesh_item.h"
 #include "Color_ramp.h"
diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Scene_facegraph_item_k_ring_selection_config.h b/Polyhedron/demo/Polyhedron/Plugins/PMP/Scene_facegraph_item_k_ring_selection_config.h
index ae6fca82005..9a0c42bcc64 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Scene_facegraph_item_k_ring_selection_config.h
+++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Scene_facegraph_item_k_ring_selection_config.h
@@ -1,7 +1,7 @@
 #ifndef SCENE_FACEGRAPH_ITEM_K_RING_SELECTION_CONFIG_H
 #define SCENE_FACEGRAPH_ITEM_K_RING_SELECTION_CONFIG_H
 
-#if defined(scene_poly_item_k_ring_selection_EXPORTS) || (scene_sm_item_k_ring_selection_EXPORTS)
+#if defined(scene_k_ring_selection_EXPORTS)
 #  define SCENE_FACEGRAPH_ITEM_K_RING_SELECTION_EXPORT Q_DECL_EXPORT
 #else
 #  define SCENE_FACEGRAPH_ITEM_K_RING_SELECTION_EXPORT Q_DECL_IMPORT
diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/CMakeLists.txt b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/CMakeLists.txt
index 630631643fc..0f501307ed5 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/CMakeLists.txt
+++ b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/CMakeLists.txt
@@ -1,10 +1,6 @@
 include( polyhedron_demo_macros )
 
 if(EIGEN3_FOUND)
-  find_package(CGAL COMPONENTS Core)
-
-  include(${CGAL_USE_FILE})
-
   qt5_wrap_ui(parameterizationUI_FILES Parameterization_widget.ui OTE_dialog.ui)
   polyhedron_demo_plugin(parameterization_plugin Parameterization_plugin ${parameterizationUI_FILES})
   target_link_libraries(parameterization_plugin PUBLIC scene_surface_mesh_item scene_textured_item scene_selection_item)
diff --git a/Polyhedron/demo/Polyhedron/Scene_polyhedron_item_decorator_config.h b/Polyhedron/demo/Polyhedron/Scene_polyhedron_item_decorator_config.h
index a6a31a21505..5d1921b7471 100644
--- a/Polyhedron/demo/Polyhedron/Scene_polyhedron_item_decorator_config.h
+++ b/Polyhedron/demo/Polyhedron/Scene_polyhedron_item_decorator_config.h
@@ -2,7 +2,7 @@
 #define SCENE_POLYHEDRON_ITEM_DECORATOR_CONFIG_H
 
 
-#if defined(scene_polyhedron_item_decorator_EXPORTS) || defined(scene_surface_mesh_item_decorator_EXPORTS)
+#if defined(scene_item_decorator_EXPORTS)
 #  define SCENE_POLYHEDRON_ITEM_DECORATOR_EXPORT Q_DECL_EXPORT
 #else
 #  define SCENE_POLYHEDRON_ITEM_DECORATOR_EXPORT Q_DECL_IMPORT