diff --git a/meta-raspberrypi/recipes-core/images/rpi-hwup-image.bb b/meta-raspberrypi/recipes-core/images/rpi-hwup-image.bb
index d2371ad..86e9b6d 100644
--- a/meta-raspberrypi/recipes-core/images/rpi-hwup-image.bb
+++ b/meta-raspberrypi/recipes-core/images/rpi-hwup-image.bb
@@ -7,5 +7,5 @@
 	"
 
 do_image_prepend() {
-    bb.warn("The image 'rpi-hwup-image' is deprecated, please use 'core-image-minimal' instead")
+    bb.warn("The image 'rpi-hwup-image' is deprecated, please use 'core-image-base' instead")
 }
diff --git a/meta-raspberrypi/recipes-core/packagegroups/packagegroup-rpi-test.bb b/meta-raspberrypi/recipes-core/packagegroups/packagegroup-rpi-test.bb
index 029c18c..d91ce0b 100644
--- a/meta-raspberrypi/recipes-core/packagegroups/packagegroup-rpi-test.bb
+++ b/meta-raspberrypi/recipes-core/packagegroups/packagegroup-rpi-test.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "RaspberryPi Test Packagegroup"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
 inherit packagegroup
 
diff --git a/meta-raspberrypi/recipes-core/psplash/psplash_git.bbappend b/meta-raspberrypi/recipes-core/psplash/psplash_%.bbappend
similarity index 100%
rename from meta-raspberrypi/recipes-core/psplash/psplash_git.bbappend
rename to meta-raspberrypi/recipes-core/psplash/psplash_%.bbappend
diff --git a/meta-raspberrypi/recipes-core/udev/udev-rules-rpi.bb b/meta-raspberrypi/recipes-core/udev/udev-rules-rpi.bb
index b249d97..edef0db 100644
--- a/meta-raspberrypi/recipes-core/udev/udev-rules-rpi.bb
+++ b/meta-raspberrypi/recipes-core/udev/udev-rules-rpi.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "udev rules for Raspberry Pi Boards"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
 SRC_URI = " file://99-com.rules"