diff --git a/CMakeLists.txt b/CMakeLists.txt
index b8339246..9a282815 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -220,25 +220,25 @@ export(EXPORT PFUNIT
 # Set some variables needed by add_pfunit_test in the parent scope so
 # that the build directory can be used directly
 if (NOT MAIN_PROJECT)
-  set(PFUNIT_MPI_FOUND "${MPI_Fortran_FOUND}" PARENT_SCOPE)
-  set(PFUNIT_MPI_USE_MPIEXEC "${MPI_USE_MPIEXEC}" PARENT_SCOPE)
-  set(PFUNIT_PARSER "${Python_EXECUTABLE}" "${PROJECT_SOURCE_DIR}/bin/funitproc" PARENT_SCOPE)
-  set(PFUNIT_DRIVER "${PROJECT_SOURCE_DIR}/include/driver.F90" PARENT_SCOPE)
-  set(PFUNIT_TESTUTILS "${PROJECT_SOURCE_DIR}/include/TestUtil.F90" PARENT_SCOPE)
+  set(PFUNIT_MPI_FOUND "${MPI_Fortran_FOUND}" CACHE INTERNAL "")
+  set(PFUNIT_MPI_USE_MPIEXEC "${MPI_USE_MPIEXEC}" CACHE INTERNAL "")
+  set(PFUNIT_PARSER "${Python_EXECUTABLE}" "${PROJECT_SOURCE_DIR}/bin/funitproc" CACHE INTERNAL "")
+  set(PFUNIT_DRIVER "${PROJECT_SOURCE_DIR}/include/driver.F90" CACHE INTERNAL "")
+  set(PFUNIT_TESTUTILS "${PROJECT_SOURCE_DIR}/include/TestUtil.F90" CACHE INTERNAL "")
 
   if (BUILD_SHARED_LIBS)
-    set (PFUNIT_SERIAL_LIBRARIES PFUNIT::funit_shared PARENT_SCOPE)
+    set (PFUNIT_SERIAL_LIBRARIES PFUNIT::funit_shared CACHE INTERNAL "")
     if (MPI_Fortran_FOUND)
-      set(PFUNIT_LIBRARIES PFUNIT::pfunit_shared PARENT_SCOPE)
+      set(PFUNIT_LIBRARIES PFUNIT::pfunit_shared CACHE INTERNAL "")
     else()
-      set(PFUNIT_LIBRARIES PFUNIT::funit_shared PARENT_SCOPE)
+      set(PFUNIT_LIBRARIES PFUNIT::funit_shared CACHE INTERNAL "")
     endif()
   else()
-    set (PFUNIT_SERIAL_LIBRARIES PFUNIT::funit PARENT_SCOPE)
+    set (PFUNIT_SERIAL_LIBRARIES PFUNIT::funit CACHE INTERNAL "")
     if (MPI_Fortran_FOUND)
-      set(PFUNIT_LIBRARIES PFUNIT::pfunit PARENT_SCOPE)
+      set(PFUNIT_LIBRARIES PFUNIT::pfunit CACHE INTERNAL "")
     else()
-      set(PFUNIT_LIBRARIES PFUNIT::funit PARENT_SCOPE)
+      set(PFUNIT_LIBRARIES PFUNIT::funit CACHE INTERNAL "")
     endif()
   endif()
 
diff --git a/ChangeLog.md b/ChangeLog.md
index 5110ffe6..142cef46 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -5,6 +5,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Change CMake from using `PARENT_SCOPE` to `CACHE INTERNAL` as it seems in some setups using
+  pFUnit via `FetchContent` the former does not work as expected.
+- Update some `cmake_minimum_required` to 3.12 to avoid some warnings
+- Update some `COMMENT` lines in functions with double-quotes to avoid warnings
+
 ## [4.11.1] - 2025-02-04
 
 ### Fixed
diff --git a/src/funit/asserts/CMakeLists.txt b/src/funit/asserts/CMakeLists.txt
index 20ed13e0..9dd29384 100644
--- a/src/funit/asserts/CMakeLists.txt
+++ b/src/funit/asserts/CMakeLists.txt
@@ -14,7 +14,7 @@ function (expand in out)
     COMMAND ${Python_EXECUTABLE} ${PFUNIT_SOURCE_DIR}/tools/overload_template.py --rank=${rank} -i ${in} -o ${out} ${python_defs}
     DEPENDS ${in} ${PFUNIT_SOURCE_DIR}/tools/overload_template.py
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    COMMENT Generating ${out}
+    COMMENT "Generating ${out}"
     )
 endfunction()
 
diff --git a/src/funit/fhamcrest/CMakeLists.txt b/src/funit/fhamcrest/CMakeLists.txt
index fd53786b..2084d71a 100644
--- a/src/funit/fhamcrest/CMakeLists.txt
+++ b/src/funit/fhamcrest/CMakeLists.txt
@@ -51,7 +51,7 @@ function (expand in out rank)
     COMMAND ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/multirank.py -i ${in} -o ${out} --rank=${rank}
     DEPENDS ${in} ${CMAKE_CURRENT_SOURCE_DIR}/multirank.py
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    COMMENT Generating ${out}
+    COMMENT "Generating ${out}"
     )
 endfunction()
 
diff --git a/tests/fhamcrest/CMakeLists.txt b/tests/fhamcrest/CMakeLists.txt
index 3d171d63..bb15a286 100644
--- a/tests/fhamcrest/CMakeLists.txt
+++ b/tests/fhamcrest/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.12)
 
 set(pf_tests
   Test_Core.pf
diff --git a/tests/funit-core/CMakeLists.txt b/tests/funit-core/CMakeLists.txt
index 0207e908..4ad94c4b 100644
--- a/tests/funit-core/CMakeLists.txt
+++ b/tests/funit-core/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.12)
 
 #include_directories (${PFUNIT_SOURCE_DIR}/include)
 #include_directories (${PFUNIT_BINARY_DIR}/src)