diff --git a/fsq_search.sh b/fsq_search.sh
index 374a5f3..d5d63f3 100755
--- a/fsq_search.sh
+++ b/fsq_search.sh
@@ -78,7 +78,7 @@
 #%
 #================================================================
 #- IMPLEMENTATION
-#-    version         ${SCRIPT_NAME} 1.2.3
+#-    version         ${SCRIPT_NAME} 1.2.4
 #-    author          Steve Magnuson, AG7GN
 #-    license         CC-BY-SA Creative Commons License
 #-    script_id       0
@@ -98,6 +98,7 @@
 
 SYNTAX=false
 DEBUG=false
+Optnum=$#
 
 #============================
 #  FUNCTIONS
diff --git a/hampi-utilities.version b/hampi-utilities.version
index 863da15..57de8c0 100644
--- a/hampi-utilities.version
+++ b/hampi-utilities.version
@@ -1 +1 @@
-VERSION="2.1.7"
\ No newline at end of file
+VERSION="2.1.8"
\ No newline at end of file
diff --git a/initialize-pi.sh b/initialize-pi.sh
index 7af1492..23487da 100755
--- a/initialize-pi.sh
+++ b/initialize-pi.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION="1.16.7"
+VERSION="1.16.8"
 
 #
 # Script to generate new VNC server and SSH server keys at boot time if a certain 
@@ -137,7 +137,7 @@ do
 done
 
 echo "Restore defaults for tnc-*.conf files" >> "$INIT_DONE_FILE"
-sed -i 's/^MYCALL=.*/MYCALL=\"N0ONE-10\"/' $(ls $DIR/tnc-*.conf)
+sed -i 's/^MYCALL=.*/MYCALL=\"N0ONE-10\"/' $DIR/tnc-*.conf
 
 # Restore defaults for rmsgw
 
@@ -179,7 +179,7 @@ crontab -u $USER -l | grep -v "autohotspotN" | crontab -u $USER -
 # Set radio names to default
 rm -f $HOME/radionames.conf
 D="/usr/local/share/applications"
-for F in `ls $D/*-left.template 2>/dev/null` `ls $D/*-right.template 2>/dev/null`
+for F in $D/*-left.template $D/*-right.template
 do
    sudo sed -e "s/_LEFT_RADIO_/Left Radio/" -e "s/_RIGHT_RADIO_/Right Radio/g" $F > ${F%.*}.desktop
 done