diff --git a/recipes-devtools/svd-tools/svd-tools_git.bb b/recipes-devtools/svd-tools/svd-tools_git.bb
index baf6f75..f80f791 100644
--- a/recipes-devtools/svd-tools/svd-tools_git.bb
+++ b/recipes-devtools/svd-tools/svd-tools_git.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 inherit pkgconfig autotools-brokensep gettext
 
-SRC_URI = "git://github.com/1udo6arre/svd-tools.git;protocol=https"
+SRC_URI = "git://github.com/1udo6arre/svd-tools.git;protocol=https;branch=master"
 SRCREV = "5b7b813481877a3b6fb8f96b4f0d413b47fb987a"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-extended/libb64/libb64_git.bb b/recipes-extended/libb64/libb64_git.bb
index e6525f4..8fb2d3f 100644
--- a/recipes-extended/libb64/libb64_git.bb
+++ b/recipes-extended/libb64/libb64_git.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "https://github.com/libb64/libb64"
 LICENSE = "PD"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ce551aad762074c7ab618a0e07a8dca3"
 
-SRC_URI = "git://github.com/libb64/libb64.git;protocol=https;branch=master"
+SRC_URI = "git://github.com/libb64/libb64.git;protocol=https;nobranch=1"
 SRCREV="04a1ee7590ebb8a81bbd3854ec141c2d4c2bead9"
 
 PV = "1.4.1+git${SRCPV}"
diff --git a/recipes-extended/m4projects/m4projects-stm32mp1.bb b/recipes-extended/m4projects/m4projects-stm32mp1.bb
index 0ff52b3..64e917f 100644
--- a/recipes-extended/m4projects/m4projects-stm32mp1.bb
+++ b/recipes-extended/m4projects/m4projects-stm32mp1.bb
@@ -1,9 +1,5 @@
 SUMMARY = "STM32MP1 Firmware examples for CM4"
-LICENSE = " \
-    Apache-2.0 \
-    & MIT \
-    & BSD-3-Clause \
-    "
+LICENSE = "Apache-2.0 & MIT & BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://License.md;md5=532c0d9fc2820ec1304ab8e0f227acc7"
 
 SRC_URI = "git://github.com/STMicroelectronics/STM32CubeMP1.git;protocol=https;branch=master"
diff --git a/recipes-kernel/linux-firmware/linux-firmware-bluetooth-bcm4343.bb b/recipes-kernel/linux-firmware/linux-firmware-bluetooth-bcm4343.bb
index 0f804cf..adb470e 100644
--- a/recipes-kernel/linux-firmware/linux-firmware-bluetooth-bcm4343.bb
+++ b/recipes-kernel/linux-firmware/linux-firmware-bluetooth-bcm4343.bb
@@ -9,7 +9,7 @@ NO_GENERIC_LICENSE[Firmware-cypress-bcm4343] = "LICENCE.cypress"
 
 inherit allarch
 
-SRC_URI = "git://github.com/murata-wireless/cyw-bt-patch;protocol=https"
+SRC_URI = "git://github.com/murata-wireless/cyw-bt-patch;protocol=https;branch=master"
 SRCREV = "c5f1b13697d4ac8eec2cb6f21636085fbb55acd1"
 
 PV = "3.0"
diff --git a/recipes-support/hidapi/hidapi-stm32mp_0.10.1.bb b/recipes-support/hidapi/hidapi-stm32mp_0.10.1.bb
index 4557e75..78075ad 100644
--- a/recipes-support/hidapi/hidapi-stm32mp_0.10.1.bb
+++ b/recipes-support/hidapi/hidapi-stm32mp_0.10.1.bb
@@ -3,7 +3,7 @@ AUTHOR = "Alan Ott"
 HOMEPAGE = "http://www.signal11.us/oss/hidapi/"
 SECTION = "libs"
 
-LICENSE = "BSD-3-Clause | GPLv3"
+LICENSE = "BSD-3-Clause | GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7c3949a631240cb6c31c50f3eb696077"
 
 SRC_URI = "git://github.com/libusb/hidapi.git;protocol=https;branch=master \