diff --git a/package/base-files/files/bin/board_detect b/package/base-files/files/bin/board_detect
index 94f45bec53a70..be4242802a7f0 100755
--- a/package/base-files/files/bin/board_detect
+++ b/package/base-files/files/bin/board_detect
@@ -5,8 +5,8 @@ CFG=$1
 [ -n "$CFG" ] || CFG=/etc/board.json
 
 [ -d "/etc/board.d/" -a ! -s "$CFG" ] && {
-	for a in $(ls /etc/board.d/*); do
-		[ -s $a ] || continue;
+	for a in /etc/board.d/*; do
+		[ -s "$a" ] || continue;
 		$(. $a)
 	done
 }
diff --git a/package/base-files/files/sbin/firstboot b/package/base-files/files/sbin/firstboot
index d9af57d59645b..9dc020a3b5432 100755
--- a/package/base-files/files/sbin/firstboot
+++ b/package/base-files/files/sbin/firstboot
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-/sbin/jffs2reset $@
+/sbin/jffs2reset "$@"