diff --git a/br-ext-chip-goke/configs/gk7205v200_fpv_defconfig b/br-ext-chip-goke/configs/gk7205v200_fpv_defconfig
index 7a46980f..c3900ecc 100644
--- a/br-ext-chip-goke/configs/gk7205v200_fpv_defconfig
+++ b/br-ext-chip-goke/configs/gk7205v200_fpv_defconfig
@@ -108,7 +108,5 @@ BR2_PACKAGE_MAVFWD=y
 BR2_PACKAGE_HOST_GDB=y
 BR2_PACKAGE_GDB=y
 
-#
 # Compression and decompression
-#
 BR2_PACKAGE_LIBZIP=y
diff --git a/br-ext-chip-goke/configs/gk7205v300_fpv_defconfig b/br-ext-chip-goke/configs/gk7205v300_fpv_defconfig
index ff8714bf..320c142a 100644
--- a/br-ext-chip-goke/configs/gk7205v300_fpv_defconfig
+++ b/br-ext-chip-goke/configs/gk7205v300_fpv_defconfig
@@ -105,12 +105,11 @@ BR2_PACKAGE_MAVLINK_ROUTER=y
 BR2_PACKAGE_MAVFWD=y
 
 # ZEROTIER
-BR2_PACKAGE_ZEROTIER_ONE=y
+# BR2_PACKAGE_ZEROTIER_ONE is not set
 
 # DEBUG
 BR2_PACKAGE_HOST_GDB=y
 BR2_PACKAGE_GDB=y
 
 # Compression and decompression
-
 BR2_PACKAGE_LIBZIP=y
diff --git a/br-ext-chip-hisilicon/configs/hi3516ev200_fpv_defconfig b/br-ext-chip-hisilicon/configs/hi3516ev200_fpv_defconfig
index 3eee16a5..20353d57 100644
--- a/br-ext-chip-hisilicon/configs/hi3516ev200_fpv_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516ev200_fpv_defconfig
@@ -108,7 +108,5 @@ BR2_PACKAGE_MAVFWD=y
 BR2_PACKAGE_HOST_GDB=y
 BR2_PACKAGE_GDB=y
 
-#
 # Compression and decompression
-#
 BR2_PACKAGE_LIBZIP=y
diff --git a/br-ext-chip-hisilicon/configs/hi3516ev300_fpv_defconfig b/br-ext-chip-hisilicon/configs/hi3516ev300_fpv_defconfig
index 5c772f5c..efebb5a6 100644
--- a/br-ext-chip-hisilicon/configs/hi3516ev300_fpv_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516ev300_fpv_defconfig
@@ -105,7 +105,7 @@ BR2_PACKAGE_MAVLINK_ROUTER=y
 BR2_PACKAGE_MAVFWD=y
 
 # ZEROTIER
-BR2_PACKAGE_ZEROTIER_ONE=y
+# BR2_PACKAGE_ZEROTIER_ONE is not set
 
 # DEBUG
 BR2_PACKAGE_HOST_GDB=y
diff --git a/general/package/datalink/files/telemetry b/general/package/datalink/files/telemetry
index 40b1c1a7..75019e92 100755
--- a/general/package/datalink/files/telemetry
+++ b/general/package/datalink/files/telemetry
@@ -39,7 +39,7 @@ case "$1" in
 	kill -9 $(pidof telemetry_rx)
 	kill -9 $(pidof telemetry_tx)
 	kill -9 $(pidof mavlink-routerd)
-    kill -9 $(pidof mavfwd)
+	kill -9 $(pidof mavfwd)
 	;;
     *)
 	echo "Usage: $0 {start|stop}"
diff --git a/general/package/wifibroadcast/Config.in b/general/package/wifibroadcast/Config.in
index 95c89766..4d8485f5 100644
--- a/general/package/wifibroadcast/Config.in
+++ b/general/package/wifibroadcast/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_WIFIBROADCAST
 	select BR2_PACKAGE_LIBPCAP
 	select BR2_PACKAGE_LIBSODIUM
 	select BR2_PACKAGE_IW
-    select BR2_PACKAGE_DATALINK
+	select BR2_PACKAGE_DATALINK
 	help
 	  Transmit hd video over wifi for the UAV.
 
diff --git a/general/package/wifibroadcast/files/wifibroadcast b/general/package/wifibroadcast/files/wifibroadcast
index ccc23954..3380d57e 100755
--- a/general/package/wifibroadcast/files/wifibroadcast
+++ b/general/package/wifibroadcast/files/wifibroadcast
@@ -124,8 +124,8 @@ case "$1" in
 	kill -9 $(pidof wfb_tx)
 	kill -9 $(pidof telemetry_rx)
 	kill -9 $(pidof telemetry_tx)
-    kill -9 $(pidof mavlink-routerd)
-    kill -9 $(pidof mavfwd)
+	kill -9 $(pidof mavlink-routerd)
+	kill -9 $(pidof mavfwd)
     ;;
     *)
     echo "Usage: $0 {start|stop}"