diff --git a/Modules/Applications/AppClassification/app/otbZonalStatistics.cxx b/Modules/Applications/AppClassification/app/otbZonalStatistics.cxx
index 1db564865225a0e147c0dfbb5eadc601e7ed6f77..c11f380fc74d5ec8d1ce3d2878e03e1d7973a62e 100644
--- a/Modules/Applications/AppClassification/app/otbZonalStatistics.cxx
+++ b/Modules/Applications/AppClassification/app/otbZonalStatistics.cxx
@@ -136,7 +136,7 @@ public:
   itkNewMacro(Self);
   itkTypeMacro(ZonalStatistics, Application);
 
-  void DoInit()
+  void DoInit() override
   {
 
     SetName("ZonalStatistics");
@@ -201,7 +201,7 @@ public:
     SetOfficialDocLink();
   }
 
-  void DoUpdateParameters()
+  void DoUpdateParameters() override
   {
     // Nothing to do here : all parameters are independent
   }
@@ -431,7 +431,7 @@ public:
       statWriter->Update();
     }
 
-    void DoExecute()
+    void DoExecute() override
     {
       // Get input image
       m_InputImage = GetParameterImage("in");
diff --git a/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModel.hxx b/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModel.hxx
index 0d3d4e1ef7a92a3dc10940f48efe926a26251986..230bd44357d3e52dd82a6598dd1893a3abd901ac 100644
--- a/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModel.hxx
+++ b/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModel.hxx
@@ -21,7 +21,7 @@
 #ifndef otbKNearestNeighborsMachineLearningModel_hxx
 #define otbKNearestNeighborsMachineLearningModel_hxx
 
-#include <boost/lexical_cast.hpp>
+#include "otb_boost_lexicalcast_header.h"
 #include "otbKNearestNeighborsMachineLearningModel.h"
 #include "otbOpenCVUtils.h"
 
diff --git a/Modules/Learning/Supervised/otb-module.cmake b/Modules/Learning/Supervised/otb-module.cmake
index 879254c83cd3111ecf2bca0c4801c5bb93b8d6c4..271eec3511496d9d42b6468d2e953a9d082a8c49 100644
--- a/Modules/Learning/Supervised/otb-module.cmake
+++ b/Modules/Learning/Supervised/otb-module.cmake
@@ -25,7 +25,7 @@ OpenCV and/or libSVM")
 otb_module(OTBSupervised
 ENABLE_SHARED
   DEPENDS
-    OTBBoost
+    OTBBoostAdapters
     OTBCommon
     OTBITK
     OTBImageBase
diff --git a/Modules/Visualization/MonteverdiCore/src/ConfigureMonteverdi.h.in b/Modules/Visualization/MonteverdiCore/src/ConfigureMonteverdi.h.in
index 4e3275d13feffbb10edf7b57f4183835416267f4..ebc3088b7f16d6d1bc85098702c15ff46250388a 100644
--- a/Modules/Visualization/MonteverdiCore/src/ConfigureMonteverdi.h.in
+++ b/Modules/Visualization/MonteverdiCore/src/ConfigureMonteverdi.h.in
@@ -127,7 +127,11 @@
 #endif
 
 #ifndef LOG_QDEBUG
-#define LOG_QDEBUG      ( !NO_QLOG && !NO_QDEBUG && defined( OTB_DEBUG ) && 0 )
+#if                     !NO_QLOG && !NO_QDEBUG && defined( OTB_DEBUG )
+#define LOG_QDEBUG      0
+#else
+#define LOG_QDEBUG      0
+#endif
 #endif
 
 #ifndef LOG_QWARNING