diff --git a/CMakeModules/DetectArchitecture.cmake b/CMakeModules/DetectArchitecture.cmake
index c5d7577840..d64ed41dd3 100644
--- a/CMakeModules/DetectArchitecture.cmake
+++ b/CMakeModules/DetectArchitecture.cmake
@@ -47,7 +47,7 @@ function(detect_architecture symbol arch)
         unset(CMAKE_REQUIRED_QUIET)
 
         if (ARCHITECTURE_${arch})
-            message(STATUS "Found architecture symbol ${symbol} for ${arch}")
+            message(STATUS "[DetectArchitecture] Found architecture symbol ${symbol} for ${arch}")
             set(ARCHITECTURE "${arch}" PARENT_SCOPE)
             set(ARCHITECTURE_${arch} 1 PARENT_SCOPE)
             add_definitions(-DARCHITECTURE_${arch}=1)
diff --git a/tools/cpm/download.sh b/tools/cpm/download.sh
index 426f1f51e6..4001fe2a19 100755
--- a/tools/cpm/download.sh
+++ b/tools/cpm/download.sh
@@ -16,6 +16,7 @@ download_package() {
 
     LOWER_PACKAGE=$(echo "$PACKAGE_NAME" | tr '[:upper:]' '[:lower:]')
     OUTDIR="${CPM_SOURCE_CACHE}/${LOWER_PACKAGE}/${KEY}"
+	TMPDIR="$TMP/extracted"
     [ -d "$OUTDIR" ] && return
 
     curl "$DOWNLOAD" -sS -L -o "$OUTFILE"
@@ -26,7 +27,8 @@ download_package() {
     mkdir -p "$OUTDIR"
 
 	PREVDIR="$PWD"
-    cd "$OUTDIR"
+	mkdir -p "$TMPDIR"
+    cd "$TMPDIR"
 
     case "$FILENAME" in
         (*.7z)
@@ -47,9 +49,12 @@ download_package() {
     # thanks gnu
     if [ "$(echo "$DIRS" | wc -l)" -eq 2 ]; then
         SUBDIR=$(find . -maxdepth 1 -type d -not -name ".")
-        mv "$SUBDIR"/* .
-        mv "$SUBDIR"/.* . 2>/dev/null || true
+        mv "$SUBDIR"/* "$OUTDIR"
+		mv "$SUBDIR"/.* "$OUTDIR" 2>/dev/null || true
         rmdir "$SUBDIR"
+	else
+		mv ./* "$OUTDIR"
+		mv ./.* "$OUTDIR" 2>/dev/null || true
     fi
 
     if echo "$JSON" | grep -e "patches" > /dev/null; then