diff --git a/config/options b/config/options
index 13f214ac17..2bebb8d4cc 100644
--- a/config/options
+++ b/config/options
@@ -6,6 +6,8 @@ fi
 
 # Spaces in paths are verboten
 if [[ ${PWD} =~ [[:space:]] ]]; then
+  echo "Current PWD: \"${PWD}\"" 1>&2
+  echo 1>&2
   echo "Building in a folder that includes spaces is NOT supported. Use a folder without spaces." 1>&2
   exit 1
 fi
diff --git a/packages/linux/package.mk b/packages/linux/package.mk
index eb8c9ef3a6..3aa28c235d 100644
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@@ -8,7 +8,7 @@ PKG_SITE="http://www.kernel.org"
 PKG_DEPENDS_HOST="ccache:host rsync:host openssl:host"
 PKG_DEPENDS_TARGET="toolchain linux:host cpio:host kmod:host xz:host wireless-regdb keyutils $KERNEL_EXTRA_DEPENDS_TARGET"
 PKG_DEPENDS_INIT="toolchain"
-PKG_NEED_UNPACK="$LINUX_DEPENDS"
+PKG_NEED_UNPACK="$LINUX_DEPENDS $(get_pkg_directory busybox)"
 PKG_LONGDESC="This package contains a precompiled kernel image and the modules."
 PKG_IS_KERNEL_PKG="yes"
 PKG_STAMP="$KERNEL_TARGET $KERNEL_MAKE_EXTRACMD"
diff --git a/packages/tools/u-boot-tools/package.mk b/packages/tools/u-boot-tools/package.mk
index dc1041b95e..85c8e419ad 100644
--- a/packages/tools/u-boot-tools/package.mk
+++ b/packages/tools/u-boot-tools/package.mk
@@ -2,13 +2,14 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="u-boot-tools"
-PKG_LICENSE="GPL"
-PKG_SITE="https://www.denx.de/wiki/U-Boot"
-PKG_DEPENDS_TARGET="toolchain swig:host"
-PKG_LONGDESC="Das U-Boot is a cross-platform bootloader for embedded systems."
 PKG_VERSION="2019.01"
 PKG_SHA256="50bd7e5a466ab828914d080d5f6a432345b500e8fba1ad3b7b61e95e60d51c22"
+PKG_LICENSE="GPL"
+PKG_SITE="https://www.denx.de/wiki/U-Boot"
 PKG_URL="http://ftp.denx.de/pub/u-boot/u-boot-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS_HOST="ccache:host bison:host flex:host"
+PKG_DEPENDS_TARGET="toolchain swig:host"
+PKG_LONGDESC="Das U-Boot is a cross-platform bootloader for embedded systems."
 
 make_host() {
   make qemu-x86_64_defconfig