diff --git a/data/payload_ssh/dropbear2.init.d.sh b/data/payload_ssh/dropbear2.init.d.sh
index 95b4fda..cc5cb3b 100644
--- a/data/payload_ssh/dropbear2.init.d.sh
+++ b/data/payload_ssh/dropbear2.init.d.sh
@@ -132,12 +132,14 @@ start_service()
 {
 	#[ -s /etc/dropbear/dropbear_rsa_host_key ] || keygen
 	rm -f /etc/dropbear/dropbear_rsa_host_key
+	
+	[ ! -e $PROG ] && return 1
 
 	if [ ! -e /etc/dropbear/dropbear_ed25519_host_key ]; then
-		$XDIR/dropbear dropbearkey -t ed25519 -f /etc/dropbear/dropbear_ed25519_host_key 0<&- 2>&- >&-
+		$PROG dropbearkey -t ed25519 -f /etc/dropbear/dropbear_ed25519_host_key 0<&- 2>&- >&-
 	fi
 	if [ ! -e /etc/dropbear/dropbear_ecdsa_host_key ]; then
-		$XDIR/dropbear dropbearkey -t ecdsa -f /etc/dropbear/dropbear_ecdsa_host_key 0<&- 2>&- >&-
+		$PROG dropbearkey -t ecdsa -f /etc/dropbear/dropbear_ecdsa_host_key 0<&- 2>&- >&-
 	fi
 
 	. /lib/functions.sh
diff --git a/data/payload_ssh/dropbear2.install.sh b/data/payload_ssh/dropbear2.install.sh
index 61468d0..7184300 100644
--- a/data/payload_ssh/dropbear2.install.sh
+++ b/data/payload_ssh/dropbear2.install.sh
@@ -8,6 +8,8 @@ if [ ! -d /etc/dropbear ]; then
 	chmod 0700 /etc/dropbear
 fi
 
+[ ! -e $XDIR/dropbear ] && return 1
+
 kill -9 `pgrep dropbear` &>/dev/null
 rm -f /etc/dropbear/dropbear_rsa_host_key
 rm -f /etc/init.d/dropbear
diff --git a/gateway.py b/gateway.py
index 2b3b3a2..09a1407 100644
--- a/gateway.py
+++ b/gateway.py
@@ -1229,7 +1229,7 @@ class Gateway():
         print(f'ARCH = {arch}')
         arch_suffix = None
         if arch.startswith('arm_'):
-            arch_suffix = '_armv7a'
+            arch_suffix = '_armv7a' if 'neon-vfp' in arch else '_armv5'
         if arch.startswith('aarch64'):
             arch_suffix = '_arm64'
         if arch.startswith('mips'):