diff --git a/install_minimal/airtime-install b/install_minimal/airtime-install
index e35888010..fe50d4a53 100755
--- a/install_minimal/airtime-install
+++ b/install_minimal/airtime-install
@@ -62,10 +62,11 @@ python ${SCRIPTPATH}/../python_apps/create-pypo-user.py
 
 set +e
 php ${SCRIPTPATH}/include/airtime-install.php $@
-if [ "$?" -eq "2" ]; then
+$result=$?
+if [ "$result" -eq "2" ]; then
     #We've just finished an upgrade, so let's exit
     exit 0
-elif [ "$?" != "0" ]; then
+elif [ "$result" -ne "0" ]; then
     #There was an error, exit with error code.
     exit 1
 fi
diff --git a/install_minimal/include/AirtimeInstall.php b/install_minimal/include/AirtimeInstall.php
index e11dd7cf2..5bce8ff37 100644
--- a/install_minimal/include/AirtimeInstall.php
+++ b/install_minimal/include/AirtimeInstall.php
@@ -352,6 +352,7 @@ class AirtimeInstall
         exec("rm -f /usr/bin/airtime-import");
         exec("rm -f /usr/bin/airtime-update-db-settings");
         exec("rm -f /usr/bin/airtime-check-system");
+        exec("rm -f /usr/bin/airtime-user");
     }
 
     public static function InstallPhpCode()
@@ -432,6 +433,7 @@ class AirtimeInstall
     }
 
     public static function CreateCronFile(){
+        echo "* Creating Cron File".PHP_EOL;
         // Create CRON task to run every day.  Time of day is initialized to a random time.
         $hour = rand(0,23);
         $minute = rand(0,59);