diff --git a/board/common/overlay/etc/init.d/S33hostapd b/board/common/overlay/etc/init.d/S33hostapd
index c7da890c31..e864dd0ff1 100755
--- a/board/common/overlay/etc/init.d/S33hostapd
+++ b/board/common/overlay/etc/init.d/S33hostapd
@@ -13,7 +13,7 @@ LINK_WATCH=yes
 LINK_WATCH_TIMEOUT=20
 
 
-test -x {$PROG} || exit 0
+test -x ${PROG} || exit 0
 
 test -n "${OS_VERSION}" || source /etc/init.d/base
 
diff --git a/board/common/overlay/etc/init.d/S41netwatch b/board/common/overlay/etc/init.d/S41netwatch
index bb2f18be17..f452c0bab8 100755
--- a/board/common/overlay/etc/init.d/S41netwatch
+++ b/board/common/overlay/etc/init.d/S41netwatch
@@ -11,8 +11,8 @@ NETWATCH_INTERVAL=20
 test -f ${CONF} || exit 0
 source ${CONF}
 
-test -z "${NETWATCH_HOST}" || exit 0
-test -z "${NETWATCH_PORT}" || exit 0
+test -n "${NETWATCH_HOST}" || exit 0
+test -n "${NETWATCH_PORT}" || exit 0
 
 test -n "${OS_VERSION}" || source /etc/init.d/base
 
diff --git a/board/common/overlay/etc/init.d/S60sshd b/board/common/overlay/etc/init.d/S60sshd
index 26709bd001..0c68a5446a 100755
--- a/board/common/overlay/etc/init.d/S60sshd
+++ b/board/common/overlay/etc/init.d/S60sshd
@@ -3,14 +3,14 @@
 CONF="/etc/sshd_config"
 
 PROG="/usr/sbin/sshd"
-KGPROG="/usr/bin/ssh-keygen"
+PROG_KG="/usr/bin/ssh-keygen"
 
 
 test -x ${PROG} || exit 0
 
 test -n "${OS_VERSION}" || source /etc/init.d/base
 
-test -x ${CONF} || exit 0
+test -f ${CONF} || exit 0
 
 test "${OS_NETWORKLESS}" == "true" && exit 0
 
@@ -19,7 +19,7 @@ start() {
     msg_begin "Starting sshd"
     
     # create any missing keys
-    if ! ${KGPROG} -A >/dev/null; then
+    if ! ${PROG_KG} -A >/dev/null; then
         msg_fail
         return 1
     fi
diff --git a/board/common/overlay/etc/init.d/S61proftpd b/board/common/overlay/etc/init.d/S61proftpd
index e83b05451b..9835df2fc3 100755
--- a/board/common/overlay/etc/init.d/S61proftpd
+++ b/board/common/overlay/etc/init.d/S61proftpd
@@ -9,7 +9,7 @@ test -x ${PROG} || exit 0
 test -n "${OS_VERSION}" || source /etc/init.d/base
 test -n "${OS_DEBUG}" || source /etc/init.d/conf
 
-test -x ${CONF} || exit 0
+test -f ${CONF} || exit 0
 
 test "${OS_NETWORKLESS}" == "true" && exit 0
 
diff --git a/board/common/overlay/etc/init.d/S62smb b/board/common/overlay/etc/init.d/S62smb
index 1135975435..e203b5556c 100755
--- a/board/common/overlay/etc/init.d/S62smb
+++ b/board/common/overlay/etc/init.d/S62smb
@@ -11,7 +11,7 @@ test -x ${PROG} || exit 0
 test -n "${OS_VERSION}" || source /etc/init.d/base
 test -n "${OS_DEBUG}" || source /etc/init.d/conf
 
-test -x ${CONF} || exit 0
+test -f ${CONF} || exit 0
 
 test "${OS_NETWORKLESS}" == "true" && exit 0
 
diff --git a/board/common/overlay/etc/init.d/S70mongod b/board/common/overlay/etc/init.d/S70mongod
index ce2b6cbb22..0b9fbaea90 100755
--- a/board/common/overlay/etc/init.d/S70mongod
+++ b/board/common/overlay/etc/init.d/S70mongod
@@ -7,7 +7,7 @@ CONF="/data/etc/mongodb.conf"
 PROG="/usr/bin/mongod"
 
 
-test -x {$PROG} || exit 0
+test -x ${PROG} || exit 0
 
 test -n "${OS_VERSION}" || source /etc/init.d/base
 
diff --git a/board/common/overlay/etc/init.d/S71redis b/board/common/overlay/etc/init.d/S71redis
index aa26670fff..6ba7a1d0a6 100755
--- a/board/common/overlay/etc/init.d/S71redis
+++ b/board/common/overlay/etc/init.d/S71redis
@@ -7,7 +7,7 @@ CONF="/data/etc/redis.conf"
 PROG="/usr/bin/redis-server"
 
 
-test -x {$PROG} || exit 0
+test -x ${PROG} || exit 0
 
 test -n "${OS_VERSION}" || source /etc/init.d/base