diff --git a/arm-multilib/CMakeLists.txt b/arm-multilib/CMakeLists.txt
index 62a3513b..753f553a 100644
--- a/arm-multilib/CMakeLists.txt
+++ b/arm-multilib/CMakeLists.txt
@@ -68,6 +68,8 @@ foreach(arg
     endif()
 endforeach()
 
+find_package(Python3 REQUIRED COMPONENTS Interpreter) # needed by fetch_*.cmake
+
 include(ExternalProject)
 include(${TOOLCHAIN_SOURCE_DIR}/cmake/fetch_llvm.cmake)
 list(APPEND passthrough_dirs "-DFETCHCONTENT_SOURCE_DIR_LLVMPROJECT=${FETCHCONTENT_SOURCE_DIR_LLVMPROJECT}")
diff --git a/arm-runtimes/CMakeLists.txt b/arm-runtimes/CMakeLists.txt
index 6493ef5d..a817681a 100644
--- a/arm-runtimes/CMakeLists.txt
+++ b/arm-runtimes/CMakeLists.txt
@@ -101,11 +101,11 @@ set(LIBC_HDRGEN "" CACHE PATH "Path to prebuilt lbc-hdrgen if not included in LL
 # Temporary location to collect the libraries as they are built.
 set(TEMP_LIB_DIR "${CMAKE_CURRENT_BINARY_DIR}/tmp_install")
 
+find_package(Python3 REQUIRED COMPONENTS Interpreter)
+
 include(ExternalProject)
 include(${TOOLCHAIN_SOURCE_DIR}/cmake/fetch_llvm.cmake)
 
-find_package(Python3 REQUIRED COMPONENTS Interpreter)
-
 # If a compiler launcher such as ccache has been set, it should be
 # passed down to each subproject build.
 set(compiler_launcher_cmake_args "")
diff --git a/cmake/fetch_picolibc.cmake b/cmake/fetch_picolibc.cmake
index 3f4f8588..65b81880 100644
--- a/cmake/fetch_picolibc.cmake
+++ b/cmake/fetch_picolibc.cmake
@@ -13,8 +13,8 @@ read_repo_version(picolibc picolibc)
 
 set(
     picolibc_patches
-    ${CMAKE_CURRENT_SOURCE_DIR}/patches/picolibc/0001-Enable-libcxx-builds.patch
-    ${CMAKE_CURRENT_SOURCE_DIR}/patches/picolibc/0002-Add-bootcode-for-AArch64-FVPs.patch
+    ${CMAKE_CURRENT_LIST_DIR}/../patches/picolibc/0001-Enable-libcxx-builds.patch
+    ${CMAKE_CURRENT_LIST_DIR}/../patches/picolibc/0002-Add-bootcode-for-AArch64-FVPs.patch
 )
 
 FetchContent_Declare(picolibc