diff --git a/scripts/features.sh b/scripts/features.sh
index f3a25d9e..42c5508b 100755
--- a/scripts/features.sh
+++ b/scripts/features.sh
@@ -51,7 +51,7 @@ packages() {
 	shift
 
 	# We only allow variable names, parentheses and the operators: & | !
-	if [ "$(expr match "$cond" '.*[^A-Za-z0-9_()&|! ].*')" -gt 0 ]; then
+	if grep -q ".*[^A-Za-z0-9_()&|! ].*" <<< "$cond"; then
 		exit 1
 	fi
 
diff --git a/scripts/modules.sh b/scripts/modules.sh
index 4df7e580..1472e82a 100644
--- a/scripts/modules.sh
+++ b/scripts/modules.sh
@@ -1,7 +1,7 @@
 . ./modules
 [ ! -f "$GLUON_SITEDIR"/modules ] || . "$GLUON_SITEDIR"/modules
 
-FEEDS="$(echo $GLUON_FEEDS $GLUON_SITE_FEEDS | tr ' ' '\n')"
+FEEDS="$(echo "$GLUON_FEEDS" "$GLUON_SITE_FEEDS" | tr ' ' '\n')"
 
 GLUON_MODULES=openwrt