diff --git a/recipes-bsp/updatehub-active-inactive-backend/updatehub-active-inactive-backend-u-boot_git.bb b/recipes-bsp/updatehub-active-inactive-backend/updatehub-active-inactive-backend-u-boot_git.bb
index 471c316..c2f8feb 100644
--- a/recipes-bsp/updatehub-active-inactive-backend/updatehub-active-inactive-backend-u-boot_git.bb
+++ b/recipes-bsp/updatehub-active-inactive-backend/updatehub-active-inactive-backend-u-boot_git.bb
@@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=838c366f69b72c5df05c96dff79b35f2"
 SRC_URI = "git://github.com/updatehub/active-inactive-backend-u-boot.git;protocol=https;branch=master"
 SRCREV = "e64ce459d879c2da7224c1eb8d3ea88a1192ea3b"
 
-S = "${WORKDIR}/git"
-
 PV = "0.0+${SRCPV}"
 
 inherit allarch
diff --git a/recipes-core/updatehub/updatehub-callbacks.bb b/recipes-core/updatehub/updatehub-callbacks.bb
index cf5e88e..f790e57 100644
--- a/recipes-core/updatehub/updatehub-callbacks.bb
+++ b/recipes-core/updatehub/updatehub-callbacks.bb
@@ -10,9 +10,6 @@ SRC_URI = " \
     file://rollback-callback \
 "
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
-
 inherit allarch
 
 do_configure[noexec] = "1"
diff --git a/recipes-core/updatehub/updatehub-device-identity_git.bb b/recipes-core/updatehub/updatehub-device-identity_git.bb
index 2f70e6d..54b9ddb 100644
--- a/recipes-core/updatehub/updatehub-device-identity_git.bb
+++ b/recipes-core/updatehub/updatehub-device-identity_git.bb
@@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=838c366f69b72c5df05c96dff79b35f2"
 SRC_URI = "git://github.com/updatehub/device-identity;protocol=https;branch=master"
 SRCREV = "265acd6464902ed531b0dea72556e4b6478ac80b"
 
-S = "${WORKDIR}/git"
-
 inherit allarch
 
 do_configure[noexec] = "1"
diff --git a/recipes-core/updatehub/updatehub-machine-info.bb b/recipes-core/updatehub/updatehub-machine-info.bb
index 0d3b0c0..916b565 100644
--- a/recipes-core/updatehub/updatehub-machine-info.bb
+++ b/recipes-core/updatehub/updatehub-machine-info.bb
@@ -3,9 +3,6 @@ SECTION = "base"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
-
 do_install() {
     echo 'MACHINE="${MACHINE}"' > machine
     install -Dm 644 machine ${D}${sysconfdir}/updatehub/machine
diff --git a/recipes-core/updatehub/updatehub-system-inquiry_git.bb b/recipes-core/updatehub/updatehub-system-inquiry_git.bb
index 0688612..c3b42fc 100644
--- a/recipes-core/updatehub/updatehub-system-inquiry_git.bb
+++ b/recipes-core/updatehub/updatehub-system-inquiry_git.bb
@@ -6,8 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=838c366f69b72c5df05c96dff79b35f2"
 SRC_URI = "git://github.com/updatehub/system-inquiry.git;protocol=https;branch=master"
 SRCREV = "399c52ed503e700fdb266c049520a15312f84b3e"
 
-S = "${WORKDIR}/git"
-
 PV = "0.0+${SRCPV}"
 
 inherit allarch
diff --git a/recipes-core/updatehub/updatehub_2.1.5.bb b/recipes-core/updatehub/updatehub_2.1.5.bb
index d0e72c6..c597a53 100644
--- a/recipes-core/updatehub/updatehub_2.1.5.bb
+++ b/recipes-core/updatehub/updatehub_2.1.5.bb
@@ -16,16 +16,12 @@ SRC_URI += " \
 "
 
 SRCREV = "9b40985b1622f3d21dd538d5c4829e1d95341e6e"
-S = "${WORKDIR}/git"
 CARGO_SRC_DIR = "updatehub"
 
 inherit systemd update-rc.d pkgconfig cargo cargo-update-recipe-crates
 
 require updatehub-crates.inc
 
-PACKAGECONFIG ?= "backward-compatibility"
-PACKAGECONFIG[backward-compatibility] = "v1-parsing"
-
 CARGO_FEATURES = "${PACKAGECONFIG_CONFARGS}"
 EXTRA_CARGO_FLAGS = "--bin ${BPN}"
 
diff --git a/recipes-staging/upx/libucl_1.03.bb b/recipes-staging/upx/libucl_1.03.bb
index b611a96..b47a52d 100644
--- a/recipes-staging/upx/libucl_1.03.bb
+++ b/recipes-staging/upx/libucl_1.03.bb
@@ -12,7 +12,7 @@ SRC_URI = "http://www.oberhumer.com/opensource/ucl/download/ucl-1.03.tar.gz \
 SRC_URI[md5sum] = "852bd691d8abc75b52053465846fba34"
 SRC_URI[sha256sum] = "b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348"
 
-S = "${WORKDIR}/ucl-${PV}"
+S = "${UNPACKDIR}/ucl-${PV}"
 
 inherit autotools lib_package
 
diff --git a/recipes-staging/upx/upx_4.2.4.bb b/recipes-staging/upx/upx_4.2.4.bb
index 3692aef..fc15fd2 100644
--- a/recipes-staging/upx/upx_4.2.4.bb
+++ b/recipes-staging/upx/upx_4.2.4.bb
@@ -14,6 +14,6 @@ SRC_URI[sha256sum] = "5ed6561607d27fb4ef346fc19f08a93696fa8fa127081e7a7114068306
 
 DEPENDS = "zlib libucl xz"
 
-S = "${WORKDIR}/upx-${PV}-src"
+S = "${UNPACKDIR}/upx-${PV}-src"
 
 BBCLASSEXTEND = "native"