diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass
index ddcd69d31..9a265801b 100644
--- a/classes/sdcard_image-rpi.bbclass
+++ b/classes/sdcard_image-rpi.bbclass
@@ -189,7 +189,8 @@ rpi_generate_sysctl_config() {
 
     # sysv sysctl config
     IMAGE_SYSCTL_CONF="${IMAGE_ROOTFS}${sysconfdir}/sysctl.conf"
-    test -e ${IMAGE_ROOTFS}${sysconfdir}/sysctl.conf && \
+    if test -e ${IMAGE_ROOTFS}${sysconfdir}/sysctl.conf; then
         sed -e "/vm.min_free_kbytes/d" -i ${IMAGE_SYSCTL_CONF}
-    echo "" >> ${IMAGE_SYSCTL_CONF} && echo "vm.min_free_kbytes = 8192" >> ${IMAGE_SYSCTL_CONF}
+        echo "" >> ${IMAGE_SYSCTL_CONF} && echo "vm.min_free_kbytes = 8192" >> ${IMAGE_SYSCTL_CONF}
+    fi
 }
diff --git a/recipes-bsp/bootfiles/rpi-config_git.bb b/recipes-bsp/bootfiles/rpi-config_git.bb
index 2c2153606..90c5454d5 100644
--- a/recipes-bsp/bootfiles/rpi-config_git.bb
+++ b/recipes-bsp/bootfiles/rpi-config_git.bb
@@ -247,22 +247,16 @@ do_deploy() {
         echo "hdmi_drive=1" >> $CONFIG
     fi
 
-    # DWC2 USB peripheral support
-    if ([ "${ENABLE_DWC2_PERIPHERAL}" = "1" ] && [ "${ENABLE_DWC2_OTG}" != "1" ]); then
+    # DWC2 USB controller mode (mutually exclusive)
+    if [ "${ENABLE_DWC2_PERIPHERAL}" = "1" ]; then
         echo "# Enable USB peripheral mode" >> $CONFIG
         echo "dtoverlay=dwc2,dr_mode=peripheral" >> $CONFIG
-    fi
-
-    # DWC2 USB host mode support
-    if [ "${ENABLE_DWC2_HOST}" = "1" ]; then
-        echo "# Enable USB host mode" >> $CONFIG
-        echo "dtoverlay=dwc2,dr_mode=host" >> $CONFIG
-    fi
-    
-    # DWC2 USB OTG support
-    if ([ "${ENABLE_DWC2_OTG}" = "1" ] && [ "${ENABLE_DWC2_PERIPHERAL}" != "1" ]); then
+    elif [ "${ENABLE_DWC2_OTG}" = "1" ]; then
         echo "# Enable USB OTG mode" >> $CONFIG
         echo "dtoverlay=dwc2,dr_mode=otg" >> $CONFIG
+    elif [ "${ENABLE_DWC2_HOST}" = "1" ]; then
+        echo "# Enable USB host mode" >> $CONFIG
+        echo "dtoverlay=dwc2,dr_mode=host" >> $CONFIG
     fi
 
     # AT86RF23X support
diff --git a/recipes-multimedia/rpidistro-ffmpeg/rpidistro-ffmpeg_7.1.13.bb b/recipes-multimedia/rpidistro-ffmpeg/rpidistro-ffmpeg_7.1.13.bb
index 7ec1f2ed9..886366b11 100644
--- a/recipes-multimedia/rpidistro-ffmpeg/rpidistro-ffmpeg_7.1.13.bb
+++ b/recipes-multimedia/rpidistro-ffmpeg/rpidistro-ffmpeg_7.1.13.bb
@@ -106,7 +106,7 @@ PACKAGECONFIG[snappy] = "--enable-libsnappy,--disable-libsnappy,snappy"
 PACKAGECONFIG[udev] = "--enable-libudev,--disable-libudev,udev"
 PACKAGECONFIG[drm] = "--enable-libdrm,--disable-libdrm,libdrm"
 PACKAGECONFIG[epoxy] = "--enable-epoxy,--disable-epoxy,libepoxy"
-PACKAGECONFIG[v4l2] = "--enable-libv4l2 --enable-v4l2-m2m,,v4l-utils"
+PACKAGECONFIG[v4l2] = "--enable-libv4l2 --enable-v4l2-m2m,--disable-libv4l2,v4l-utils"
 PACKAGECONFIG[mmal] = "--enable-omx --enable-omx-rpi --enable-mmal,,userland"
 PACKAGECONFIG[sand] = "--enable-sand,,"
 PACKAGECONFIG[vout-drm] = "--enable-vout-drm,,libdrm"