diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a080a2c53d983cb921a9b8847efd22fa091b859..af8d35ff58b02e11065d09276c6314c60a7305fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,14 +38,19 @@ message(STATUS "CMAKE_INSTALL_FULL_INCLUDEDIR: ${CMAKE_INSTALL_FULL_INCLUDEDIR}"
 # Add folder where are supportive functions
 set(CMAKE_UTILS_PATH ${CMAKE_SOURCE_DIR}/CMakeStuff)
 set(CMAKE_TOOLCHAINS_PATH ${CMAKE_UTILS_PATH}/toolchains)
+
+# We need a variable that is not modified by CMake because we'll need to access
+# that specific directory later
 set(LOCAL_CMAKE_MODULE_PATH ${CMAKE_UTILS_PATH}/modules)
 message("CMakeLists.txt - LOCAL_CMAKE_MODULE_PATH:" ${LOCAL_CMAKE_MODULE_PATH})
-set(CMAKE_MODULE_PATH ${CMAKE_UTILS_PATH}/modules ${CMAKE_MODULE_PATH})
+
+# Now add our local path to the general path list.
+set(CMAKE_MODULE_PATH ${LOCAL_CMAKE_MODULE_PATH} ${CMAKE_MODULE_PATH})
 
 # This include must come before all the others
 # It must include the config-generated config.h file
 # before the others.
-#include_directories(${CMAKE_BINARY_DIR})
+include_directories(${CMAKE_BINARY_DIR})
 
 # Include the system's uname that fills in SYSTEM_UNAME_S.
 # Sets WIN64 if SYSTEM_UNAME_S is "^.*MING64.*"
@@ -186,11 +191,12 @@ message(STATUS "Boost_INCLUDES: ${Boost_INCLUDE_DIRS}")
 message(STATUS "Boost_LIB_DIRS: ${Boost_LIBRARY_DIRS}")
 
 
-if(QCustomPlot_FOUND)
-else (QCustomPlot_FOUND)
-  set(QCustomPlot_DIR ${CMAKE_MODULE_PATH})
-  find_package(QCustomPlot REQUIRED)
-endif(QCustomPlot_FOUND)
+# QCustomPlotQt6
+if(QCustomPlotQt6_FOUND)
+else (QCustomPlotQt6_FOUND)
+  set(QCustomPlotQt6_DIR ${CMAKE_MODULE_PATH})
+  find_package(QCustomPlotQt6 REQUIRED)
+endif(QCustomPlotQt6_FOUND)
 
 
 if(Alglib_FOUND)
diff --git a/debian/control b/debian/control
index f685fc06586cb8e3aa3bd2e509041816983148d2..23a624e0df655803e349560a77fc7b43df891be7 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Build-Depends: debhelper-compat (= 12),
  libsqlite3-dev,
  libzstd-dev (>= 1.3.3),
  liblzf-dev,
+ zlib1g-dev,
  libboost-dev,
  libboost-iostreams-dev,
  libboost-thread-dev,