diff --git a/Makefile b/Makefile
index e30c34dfbf5cb76e7729744efdb59fa540d10ea7..88cb09a385ad53b73cf4a2264b35065598ec407c 100644
--- a/Makefile
+++ b/Makefile
@@ -699,9 +699,11 @@ ifneq ($(wildcard $(PREBUILT_TOOLCHAIN_MAKEFILE)),)
 endif
 
 ifneq ($(GCC),)
-  # Force using internal CCORI if GCC specified
+  # Force using internal CCORI if GCC specified and there is really an internal gcc
   ifeq ($(CCORI),)
-    CCORI := internal
+    ifneq ($(shell which $(CCPRE)gcc),)
+      CCORI := internal
+    endif
   endif
 endif
 
diff --git a/boards/riscv64/tiny-riscv-box/bsp b/boards/riscv64/tiny-riscv-box/bsp
index 50f29c4df56a667f28df12606aebd2b4d98d38df..04166d1eccc613c022b3f904e25a1d7d8a939afe 160000
--- a/boards/riscv64/tiny-riscv-box/bsp
+++ b/boards/riscv64/tiny-riscv-box/bsp
@@ -1 +1 @@
-Subproject commit 50f29c4df56a667f28df12606aebd2b4d98d38df
+Subproject commit 04166d1eccc613c022b3f904e25a1d7d8a939afe
diff --git a/tools/root/install.sh b/tools/root/install.sh
index aa0f9c7daa9caaf3e02bf82dc7b40e6ab29d5c16..63cb563e65219b01a405a9f2f3e1b7506ca9b389 100755
--- a/tools/root/install.sh
+++ b/tools/root/install.sh
@@ -21,6 +21,6 @@ do
 
   # Copy everything, including devices (recreate)
   if [ -d "$sys" ]; then
-    sudo rsync -au $sys/* $ROOTDIR/
+    sudo rsync -a $sys/* $ROOTDIR/
   fi
 done
diff --git a/tools/root/rd2dir.sh b/tools/root/rd2dir.sh
index 54d57143543e7dc5484ed9826d2b7b0b62af3eea..07cf25f01d4d944bcbc17515f78cd144cddc7a03 100755
--- a/tools/root/rd2dir.sh
+++ b/tools/root/rd2dir.sh
@@ -12,7 +12,7 @@
 _ROOTDIR=$(echo ${INITRD} | sed -e "s%.cpio.gz%%g" | sed -e "s%.cpio%%g")
 
 FS_CPIO_GZ=${_ROOTDIR}.cpio.gz
-CPIO_GZ=${_ROOTDIR}.cpio
+FS_CPIO=${_ROOTDIR}.cpio
 
 mkdir -p ${ROOTDIR}