diff --git a/doc/conf.py b/doc/conf.py
index c835da8ff01df1ea06cf4e8d28854c05699b60fe..a58e1e426baaeb58340381127abca6e7c01aceed 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -26,6 +26,12 @@ from docutils import nodes
 from sphinx.util.docfields import TypedField
 from sphinx import addnodes
 
+# This shouldn't be needed, as using a virtualenv + setup.py should set up the
+# sys.path correctly. However that seems to be half broken on ReadTheDocs, so
+# manually set it here
+sys.path.insert(0, os.path.abspath('../'))
+
+# Import our packages after modifying sys.path
 import lisa
 
 # This ugly hack is required because by default TestCase.__module__ is
@@ -76,11 +82,6 @@ def patched_make_field(self, types, domain, items, env=None):
 
 TypedField.make_field = patched_make_field
 
-# This shouldn't be needed, as using a virtualenv + setup.py should set up the
-# sys.path correctly. However that seems to be half broken on ReadTheDocs, so
-# manually set it here
-sys.path.insert(0, os.path.abspath('../'))
-
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
diff --git a/external/devlib/devlib/bin/scripts/shutils.in b/external/devlib/devlib/bin/scripts/shutils.in
index e230229e18d6334b00d59d13b9d23aa29484435a..149bc8ffc720e1b2421e50350b673fa83aaca3d1 100755
--- a/external/devlib/devlib/bin/scripts/shutils.in
+++ b/external/devlib/devlib/bin/scripts/shutils.in
@@ -271,9 +271,7 @@ read_tree_tgz_b64() {
     # 'tar' doesn't work as expected on debugfs, so copy the tree first to
     # workaround the issue
     cd $BASEPATH
-    for CUR_FILE in $($BUSYBOX find . -follow -type f -maxdepth $MAXDEPTH); do
-        $BUSYBOX cp --parents $CUR_FILE $TMP_FOLDER/ 2> /dev/null
-    done
+	$BUSYBOX find . -follow -type f -maxdepth $MAXDEPTH -print0 | $BUSYBOX xargs -0 -I '{}' -n 999999 $BUSYBOX cp --parents '{}' $TMP_FOLDER/ 2> /dev/null
 
     cd $TMP_FOLDER
     $BUSYBOX tar cz * 2>/dev/null | $BUSYBOX base64