diff --git a/CMakeLists.txt b/CMakeLists.txt
index de95f7a..69743d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -175,8 +175,6 @@ IF(BUILD_TESTS)
 ENDIF()
 
 
-
-
 # OpenCV
 OPTION(USE_OPENCV "Add OpenCV support" ON)
 IF(USE_OPENCV)
@@ -269,7 +267,7 @@ IF(USE_WERROR)
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
 ENDIF()
 
-SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -O0")
+SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -O0 -DCLP_DEBUG")
 IF(BUILD_WITH_SANITIZERS)
   SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=address -fsanitize=leak -fsanitize=undefined")
 ENDIF()
diff --git a/lib/CalypPixel.cpp b/lib/CalypPixel.cpp
index 7297bfa..95204a9 100644
--- a/lib/CalypPixel.cpp
+++ b/lib/CalypPixel.cpp
@@ -149,6 +149,7 @@ auto CalypPixel::operator==( const CalypPixel& other ) const -> bool
 
 std::ostream& operator<<( std::ostream& os, const CalypPixel& p )
 {
+#ifdef CLP_DEBUG
   if( p.colorSpace() == CLP_COLOR_RGB || p.colorSpace() == CLP_COLOR_YUV )
   {
     os << "(" << p[0] << ", " << p[1] << ", " << p[2] << ")";
@@ -157,6 +158,7 @@ std::ostream& operator<<( std::ostream& os, const CalypPixel& p )
   {
     os << "(" << p[0] << ", " << p[1] << ", " << p[2] << ", " << p[3] << ")";
   }
+#endif
   return os;
 }
 
diff --git a/lib/StreamHandlerRaw.cpp b/lib/StreamHandlerRaw.cpp
index b11078e..a9e141c 100644
--- a/lib/StreamHandlerRaw.cpp
+++ b/lib/StreamHandlerRaw.cpp
@@ -62,7 +62,7 @@ bool StreamHandlerRaw::openHandler( std::string strFilename, bool bInput )
     return false;
   }
   calculateFrameNumber();
-  std::string fileExtension = std::filesystem::path{ strFilename }.extension();
+  std::string fileExtension = std::filesystem::path{ strFilename }.extension().string();
   fileExtension.erase( fileExtension.begin() );
   m_strFormatName = clpUppercase( fileExtension );
   m_strCodecName = "Raw Video";
diff --git a/modules/ShapeDetection.cpp b/modules/ShapeDetection.cpp
index d03e5ec..0dee869 100644
--- a/modules/ShapeDetection.cpp
+++ b/modules/ShapeDetection.cpp
@@ -24,12 +24,10 @@
 #include "ShapeDetection.h"
 
 #include <cstdlib>
-
-//#include <opencv2/video/video.hpp>
+#include <opencv2/imgproc.hpp>
 
 using cv::Mat;
 using cv::Ptr;
-using namespace cv::saliency;
 
 ShapeDetection::ShapeDetection()
     : m_rng( 12345 )
diff --git a/modules/ShapeDetection.h b/modules/ShapeDetection.h
index cdbd375..f10ea3e 100644
--- a/modules/ShapeDetection.h
+++ b/modules/ShapeDetection.h
@@ -30,7 +30,6 @@
 
 // OpenCV
 #include <opencv2/core/core.hpp>
-#include <opencv2/saliency.hpp>
 
 class ShapeDetection : public CalypOpenCVModuleIf,
                        public CalypModuleInstace<ShapeDetection>