diff --git a/libs/core/config/include/hpx/config.hpp b/libs/core/config/include/hpx/config.hpp
index 2375a0bb04d6..09582f5b5981 100644
--- a/libs/core/config/include/hpx/config.hpp
+++ b/libs/core/config/include/hpx/config.hpp
@@ -439,7 +439,7 @@
 #  define HPX_HAVE_MAX_CPU_COUNT 256
 #endif
 
-#if !defined(HPX_HAVE_MAX_CPU_COUNT)
+#if !defined(HPX_HAVE_MAX_CPU_COUNT) && !defined(HPX_HAVE_MORE_THAN_64_THREADS)
 #define HPX_HAVE_MAX_CPU_COUNT 64
 #endif
 
diff --git a/libs/core/resource_partitioner/src/detail_partitioner.cpp b/libs/core/resource_partitioner/src/detail_partitioner.cpp
index 6beba34b07e0..0e521c542a1d 100644
--- a/libs/core/resource_partitioner/src/detail_partitioner.cpp
+++ b/libs/core/resource_partitioner/src/detail_partitioner.cpp
@@ -607,7 +607,7 @@ namespace hpx::resource::detail {
             {
                 return true;
             }
-            for (auto const assigned_pus :
+            for (auto const& assigned_pus :
                 initial_thread_pools_[i].assigned_pus_)
             {
                 if (!threads::any(assigned_pus))