diff --git a/cmake/HPX_GeneratePackageUtils.cmake b/cmake/HPX_GeneratePackageUtils.cmake
index 2e5114fc872..497e8ef5e08 100644
--- a/cmake/HPX_GeneratePackageUtils.cmake
+++ b/cmake/HPX_GeneratePackageUtils.cmake
@@ -243,16 +243,21 @@ function(hpx_sanitize_usage_requirements property is_build)
 endfunction(hpx_sanitize_usage_requirements)
 
 function(hpx_filter_language_flags cflag_list)
-    set(_cflag_list "${${cflag_list}}")
-    # We are always in CXX, so replace conditional values with the values themselves
-    string(REGEX REPLACE "\\$<\\$<COMPILE_LANGUAGE:CXX>:([^>]*)>?" "\\1" _cflag_list "${_cflag_list}")
-    # Remove conditional values for other languages
-    string(REGEX REPLACE "\\$<\\$<COMPILE_LANGUAGE:[^>]*>:([^>]*)>?" "" _cflag_list "${_cflag_list}")
-
-    set(${cflag_list}
-        ${_cflag_list}
-        PARENT_SCOPE
-    )
+  set(_cflag_list "${${cflag_list}}")
+  # We are always in CXX, so replace conditional values with the values
+  # themselves
+  string(REGEX REPLACE "\\$<\\$<COMPILE_LANGUAGE:CXX>:([^>]*)>?" "\\1"
+                       _cflag_list "${_cflag_list}"
+  )
+  # Remove conditional values for other languages
+  string(REGEX REPLACE "\\$<\\$<COMPILE_LANGUAGE:[^>]*>:([^>]*)>?" ""
+                       _cflag_list "${_cflag_list}"
+  )
+
+  set(${cflag_list}
+      ${_cflag_list}
+      PARENT_SCOPE
+  )
 endfunction(hpx_filter_language_flags)
 
 # Append the corresponding (-D, -I) flags for the compilation
@@ -393,10 +398,6 @@ function(hpx_generate_pkgconfig_from_target target template is_build)
 
   string(TOLOWER ${CMAKE_BUILD_TYPE} build_type)
 
-#   Print hpx_library_list and hpx_cflags_list
-    message(STATUS "hpx_library_list: ${hpx_library_list}")
-    message(STATUS "hpx_cflags_list: ${hpx_cflags_list}")
-
   configure_file(
     cmake/templates/${template}.pc.in
     ${OUTPUT_DIR}${template}_${build_type}.pc.in @ONLY ESCAPE_QUOTES
diff --git a/cmake/HPX_SetupBoost.cmake b/cmake/HPX_SetupBoost.cmake
index ca4c4b1a62b..1a7d4f09e60 100644
--- a/cmake/HPX_SetupBoost.cmake
+++ b/cmake/HPX_SetupBoost.cmake
@@ -49,7 +49,7 @@ if(NOT TARGET hpx_dependencies_boost)
 
     find_package(
       Boost ${Boost_MINIMUM_VERSION} NO_POLICY_SCOPE REQUIRED
-      COMPONENTS ${__boost_libraries} HINTS ${HPX_BOOST_ROOT}
+      COMPONENTS ${__boost_libraries} HINTS ${HPX_BOOST_ROOT} $ENV{BOOST_ROOT}
     )
 
     add_library(hpx_dependencies_boost INTERFACE IMPORTED)
@@ -82,7 +82,8 @@ if(NOT TARGET hpx_dependencies_boost)
     )
 
     # Need to explicitly list header-only dependencies, since Cmake-Boost has
-    # installs each library's headers individually, as opposed to b2-built Boost.
+    # installs each library's headers individually, as opposed to b2-built
+    # Boost.
     set(__boost_libraries
         ${__boost_libraries}
         accumulators