diff --git a/general/overlay/usr/sbin/sysupgrade b/general/overlay/usr/sbin/sysupgrade
index ae0e7551..0ae5126d 100755
--- a/general/overlay/usr/sbin/sysupgrade
+++ b/general/overlay/usr/sbin/sysupgrade
@@ -111,27 +111,27 @@ free_resources() {
 }
 
 self_update() {
-  if echo "${args}" | grep "rootfs" || echo  "${args}" | grep "kernel" || echo "${args}" | grep -- "-n" > /dev/null 2>&1; then
-	  echo -e "\nOffline upgrade or Overlay clean, skip sysupgrade version check."
-  else
-	  echo -e "\nOnline upgrade, checking sysupgrade version..."
-	  curl -s -k -L -o /tmp/sysupgrade "https://raw.githubusercontent.com/OpenIPC/firmware/master/general/overlay/usr/sbin/sysupgrade"
-	  dstv=`grep scr_version /tmp/sysupgrade | head -1 | cut -f 2 -d '='`
-	  if ! [ "${scr_version}" = "${dstv}" ]; then
-		  echo "A new version is available, trying to update..."
-		  chmod +x /tmp/sysupgrade
-		  echo -e "Done. Restarting...\n"
-		  exec /tmp/sysupgrade ${args}
-		  exit 1
-	  else
-		  echo "Ok, version match."
-	  fi
-  fi
+	if echo "${args}" | grep "rootfs" || echo  "${args}" | grep "kernel" || echo "${args}" | grep -- "-n" > /dev/null 2>&1; then
+		echo -e "\nOffline upgrade or Overlay clean, skip sysupgrade version check."
+  	else
+		echo -e "\nOnline upgrade, checking sysupgrade version..."
+	  	curl -s -k -L -o /tmp/sysupgrade "https://raw.githubusercontent.com/OpenIPC/firmware/master/general/overlay/usr/sbin/sysupgrade"
+	  	dstv=`grep scr_version /tmp/sysupgrade | head -1 | cut -f 2 -d '='`
+	  	if ! [ "${scr_version}" = "${dstv}" ]; then
+			echo "A new version is available, trying to update..."
+			chmod +x /tmp/sysupgrade
+			echo -e "Done. Restarting...\n"
+			exec /tmp/sysupgrade ${args}
+			exit 1
+	  	else
+			echo "Ok, version match."
+	  	fi
+  	fi
 }
 
 create_lock() {
-  [ -f /tmp/sysupgrade.lock ] && echo -e "\e[1;31m\nAnother sysupgrade process is already running!\e[0m\n" && exit 1
-  touch /tmp/sysupgrade.lock
+	[ -f /tmp/sysupgrade.lock ] && echo -e "\e[1;31m\nAnother sysupgrade process is already running!\e[0m\n" && exit 1
+	touch /tmp/sysupgrade.lock
 }
 
 get_device() {
diff --git a/general/package/dropbear-openipc/dropbear-openipc.mk b/general/package/dropbear-openipc/dropbear-openipc.mk
index 5b249e69..3f2ff425 100644
--- a/general/package/dropbear-openipc/dropbear-openipc.mk
+++ b/general/package/dropbear-openipc/dropbear-openipc.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 DROPBEAR_OPENIPC_VERSION = 2022.82
-DROPBEAR_OPENIPC_SITE = https://matt.ucc.asn.au/dropbear/releases
+DROPBEAR_OPENIPC_SITE = http://sources.buildroot.net/dropbear
 DROPBEAR_OPENIPC_SOURCE = dropbear-$(DROPBEAR_OPENIPC_VERSION).tar.bz2
 DROPBEAR_OPENIPC_LICENSE = MIT, BSD-2-Clause, Public domain
 DROPBEAR_OPENIPC_LICENSE_FILES = LICENSE
diff --git a/general/package/mavlink-router/files/S97mavlink b/general/package/mavlink-router/files/S97mavlink
index 0cc86434..b29dc972 100755
--- a/general/package/mavlink-router/files/S97mavlink
+++ b/general/package/mavlink-router/files/S97mavlink
@@ -5,8 +5,12 @@
 
 case "$1" in
   start)
+    if grep -q telemetry=true /etc/wfb.conf; then
       echo "Starting mavlink router daemon..."
       /usr/bin/mavlink-routerd &
+    else
+      echo "Telemetry service disabled in wfb.conf..."
+    fi
     ;;
   stop)
     echo "Stopping mavlink router daemon..."