diff --git a/heppyy/CMakeLists.txt b/heppyy/CMakeLists.txt
index d0552d8..f7c9d09 100644
--- a/heppyy/CMakeLists.txt
+++ b/heppyy/CMakeLists.txt
@@ -1,5 +1,5 @@
 # This file is just an orchestration
-cmake_minimum_required(VERSION 3.13.5)
+cmake_minimum_required(VERSION 3.15)
 # SWIG: use SWIG_MODULE_NAME property.
 if(POLICY CMP0086)
   cmake_policy(SET CMP0086 NEW)
diff --git a/heppyy/cmake/heppyy_find_python.cmake b/heppyy/cmake/heppyy_find_python.cmake
index 817dfcb..11345f1 100644
--- a/heppyy/cmake/heppyy_find_python.cmake
+++ b/heppyy/cmake/heppyy_find_python.cmake
@@ -1,4 +1,4 @@
-find_package(Python 3.6 REQUIRED COMPONENTS Interpreter Development NumPy)
+find_package(Python 3.6 REQUIRED COMPONENTS Interpreter Development.Module NumPy)
 if (Python_FOUND)
     message(STATUS "${Green}Python ver. ${Python_VERSION} found.${ColourReset}")
     set(HEPPY_PYTHON_FOUND True)