diff --git a/classes/external-toolchain.bbclass b/classes/external-toolchain.bbclass
index 251096e..4434617 100644
--- a/classes/external-toolchain.bbclass
+++ b/classes/external-toolchain.bbclass
@@ -14,9 +14,16 @@
 # LIC_FILES_CHKSUM, so use the license from common-licenses
 inherit common-license
 
+# We don't extract anything which will create S, and we don't want to see the
+# warning about it
+S = "${WORKDIR}"
+
 # Prebuilt binaries, no need for any default dependencies
 INHIBIT_DEFAULT_DEPS = "1"
 
+# Missing build deps don't matter when we don't build anything
+INSANE_SKIP_${PN} += "build-deps"
+
 EXTERNAL_PN ?= "${@PN.replace('-external', '')}"
 PROVIDES += "${EXTERNAL_PN}"
 LICENSE = "CLOSED"
diff --git a/conf/distro/include/tcmode-external-sourcery.inc b/conf/distro/include/tcmode-external-sourcery.inc
index ba2ccb5..67371d0 100644
--- a/conf/distro/include/tcmode-external-sourcery.inc
+++ b/conf/distro/include/tcmode-external-sourcery.inc
@@ -55,6 +55,7 @@ PNBLACKLIST[gcc-cross] = "not building with an external toolchain"
 PNBLACKLIST[gcc-cross-initial] = "not building with an external toolchain"
 PNBLACKLIST[gcc-cross-intermediate] = "not building with an external toolchain"
 PNBLACKLIST[gcc-runtime] = "not building with an external toolchain"
+PNBLACKLIST[libgcc-initial] = "not building with an external toolchain"
 PNBLACKLIST[libgcc] = "not building with an external toolchain"
 PNBLACKLIST[linux-libc-headers] = "not building with an external toolchain"
 PNBLACKLIST[linux-libc-headers-yocto] = "not building with an external toolchain"
diff --git a/core/recipes-support/libunwind/libunwind_%.bbappend b/core/recipes-support/libunwind/libunwind_%.bbappend
new file mode 100644
index 0000000..9920e7e
--- /dev/null
+++ b/core/recipes-support/libunwind/libunwind_%.bbappend
@@ -0,0 +1,3 @@
+# For now, Sourcery G++ doesn't seem to have the gcc version which breaks the
+# libunwind build, and it doesn't ship gold, we don't want to try to use it.
+LDFLAGS_remove = "-fuse-ld=gold"
diff --git a/recipes-external/gdb/gdbserver-external.bb b/recipes-external/gdb/gdbserver-external.bb
index dddd5f5..e12c422 100644
--- a/recipes-external/gdb/gdbserver-external.bb
+++ b/recipes-external/gdb/gdbserver-external.bb
@@ -28,3 +28,9 @@ FILES_${PN} = "\
 "
 INSANE_SKIP_${PN} += "dev-so"
 FILES_${PN}-doc = "${mandir}/man1/gdbserver.1"
+
+# Ensure that our rdeps are able to be set by shlibs processing
+do_package[depends] += "\
+    virtual/libc:do_packagedata \
+    virtual/${TARGET_PREFIX}compilerlibs:do_packagedata \
+"
diff --git a/recipes-external/glibc/glibc-external.bb b/recipes-external/glibc/glibc-external.bb
index e5bd709..d28d0cb 100644
--- a/recipes-external/glibc/glibc-external.bb
+++ b/recipes-external/glibc/glibc-external.bb
@@ -131,3 +131,7 @@ FILES_${PN}-dev += "\
     ${includedir}/uchar.h \
 "
 FILES_${PN}-dev[file-checksums] += "${libc_headers_file}"
+
+# Currently, ldd and tzcode from Sourcery G++ still have #!/bin/bash
+RDEPENDS_ldd += "bash"
+RDEPENDS_tzcode += "bash"