diff --git a/common/recipes-core/systemd/systemd/0001-sd-bus-Don-t-automatically-add-ObjectManager.patch b/common/recipes-core/systemd/systemd/0001-sd-bus-Don-t-automatically-add-ObjectManager.patch
new file mode 100644
index 0000000..bb0c8a2
--- /dev/null
+++ b/common/recipes-core/systemd/systemd/0001-sd-bus-Don-t-automatically-add-ObjectManager.patch
@@ -0,0 +1,56 @@
+From 44562e33655668033a8ee0a7a686671226da2110 Mon Sep 17 00:00:00 2001
+From: Brad Bishop <bradleyb@fuzziesquirrel.com>
+Date: Tue, 13 Mar 2018 15:34:30 -0400
+Subject: [PATCH] sd-bus: Don't automatically add ObjectManager
+
+Even though sdbus helps manage org.freedesktop.DBus.ObjectManager
+it must still be explictly enabled by a library client.
+
+As such do not automatically add ObjectManager to GetManagedObjects
+method call responses or InterfacesAdded/Removed signals.  Bus
+service client applications can potentially react to the appearance
+of ObjectManager in these messages and follow up with a method call
+on the interface, which isn't actually implemented on the objects
+within the subtree, below the manager.
+---
+ src/libsystemd/sd-bus/bus-objects.c | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c
+index 6e00255b2..59f698402 100644
+--- a/src/libsystemd/sd-bus/bus-objects.c
++++ b/src/libsystemd/sd-bus/bus-objects.c
+@@ -1076,10 +1076,6 @@ static int object_manager_serialize_path(
+                         if (r < 0)
+                                 return r;
+ 
+-                        r = sd_bus_message_append(reply, "{sa{sv}}", "org.freedesktop.DBus.ObjectManager", 0);
+-                        if (r < 0)
+-                                return r;
+-
+                         found_something = true;
+                 }
+ 
+@@ -2302,9 +2298,6 @@ static int object_added_append_all(sd_bus *bus, sd_bus_message *m, const char *p
+         if (r < 0)
+                 return r;
+         r = sd_bus_message_append(m, "{sa{sv}}", "org.freedesktop.DBus.Properties", 0);
+-        if (r < 0)
+-                return r;
+-        r = sd_bus_message_append(m, "{sa{sv}}", "org.freedesktop.DBus.ObjectManager", 0);
+         if (r < 0)
+                 return r;
+ 
+@@ -2473,9 +2466,6 @@ static int object_removed_append_all(sd_bus *bus, sd_bus_message *m, const char
+         if (r < 0)
+                 return r;
+         r = sd_bus_message_append(m, "s", "org.freedesktop.DBus.Properties");
+-        if (r < 0)
+-                return r;
+-        r = sd_bus_message_append(m, "s", "org.freedesktop.DBus.ObjectManager");
+         if (r < 0)
+                 return r;
+ 
+-- 
+2.14.3
+
diff --git a/common/recipes-core/systemd/systemd_%.bbappend b/common/recipes-core/systemd/systemd_%.bbappend
index e7eeb5a..a157bfe 100644
--- a/common/recipes-core/systemd/systemd_%.bbappend
+++ b/common/recipes-core/systemd/systemd_%.bbappend
@@ -8,6 +8,7 @@
 FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
 SRC_URI += "file://default.network"
 SRC_URI += "file://service-restart-policy.conf"
+SRC_URI += "file://0001-sd-bus-Don-t-automatically-add-ObjectManager.patch"
 SRC_URI += "file://0001-Export-message_append_cmdline.patch"
 SRC_URI += "file://0002-systemd-Make-pam-compile-shared-library.patch"
 SRC_URI += "file://0003-basic-Factor-out-string-checking-from-name_to_prefix.patch"
@@ -23,9 +24,6 @@
 
 SRC_URI += "file://0007-journal-Add-Synchronize-dbus-method.patch"
 SRC_URI_append_df-obmc-ubi-fs = " file://software.conf"
-SRC_URI += "file://0008-man-update-machine-id-5-with-a-note-about-privacy-46.patch"
-SRC_URI += "file://0009-sd-id128-add-new-sd_id128_get_machine_app_specific-A.patch"
-SRC_URI += "file://0010-core-add-khash-API-to-src-basic-as-wrapper-around-ke.patch"
 
 RRECOMMENDS_${PN} += "obmc-targets"
 FILES_${PN} += "${libdir}/systemd/network/default.network"
diff --git a/common/recipes-devtools/nodejs/nodejs_4.8.2.bbappend b/common/recipes-devtools/nodejs/nodejs_8.4.0.bbappend
similarity index 100%
rename from common/recipes-devtools/nodejs/nodejs_4.8.2.bbappend
rename to common/recipes-devtools/nodejs/nodejs_8.4.0.bbappend
diff --git a/common/recipes-devtools/python/python-mako_%.bbappend b/common/recipes-devtools/python/python-mako_%.bbappend
deleted file mode 100644
index b4b5923..0000000
--- a/common/recipes-devtools/python/python-mako_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-RDEPENDS_${PN} += "python-resource"
diff --git a/common/recipes-devtools/python/python-mako_1.0.7.bb b/common/recipes-devtools/python/python-mako_1.0.7.bb
new file mode 100644
index 0000000..1bc2efc
--- /dev/null
+++ b/common/recipes-devtools/python/python-mako_1.0.7.bb
@@ -0,0 +1,11 @@
+require recipes-devtools/python/python-mako.inc
+
+inherit setuptools
+
+RDEPENDS_${PN} = "python-threading \
+                  python-netclient \
+                  python-html \
+"
+RDEPENDS_${PN}_class-native = ""
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/common/recipes-phosphor/mboxd/mboxd.bb b/common/recipes-phosphor/mboxd/mboxd.bb
index 0a30b7b..f90ab86 100644
--- a/common/recipes-phosphor/mboxd/mboxd.bb
+++ b/common/recipes-phosphor/mboxd/mboxd.bb
@@ -8,11 +8,6 @@
 inherit obmc-phosphor-systemd
 
 DEPENDS += "autoconf-archive-native"
-
-# Drop gnome-common-native if AX_CODE_COVERAGE ever comes back to
-# autoconf-archive upstream.
-DEPENDS += "gnome-common-native"
-
 DEPENDS += "systemd"
 DEPENDS += "phosphor-logging"
 RDEPENDS_${PN} += "libsystemd"