diff --git a/install/include/airtime-upgrade.php b/install/include/airtime-upgrade.php
index 4a242a518..aaec375c3 100644
--- a/install/include/airtime-upgrade.php
+++ b/install/include/airtime-upgrade.php
@@ -68,10 +68,10 @@ echo "******************************** Update Begin ****************************
 $version = substr($version, 0, 5);
 
 if (strcmp($version, "1.7.0") < 0){
-    system("php ".__DIR__."/../upgrades/airtime-1.7/airtime-upgrade.php");
+    system("php ".__DIR__."/../upgrades/airtime-1.7.0/airtime-upgrade.php");
 }
 if (strcmp($version, "1.8.0") < 0){
-    system("php ".__DIR__."/../upgrades/airtime-1.8/airtime-upgrade.php");
+    system("php ".__DIR__."/../upgrades/airtime-1.8.0/airtime-upgrade.php");
 }
 if (strcmp($version, "1.8.1") < 0){
     system("php ".__DIR__."/../upgrades/airtime-1.8.1/airtime-upgrade.php");
@@ -80,7 +80,7 @@ if (strcmp($version, "1.8.2") < 0){
     system("php ".__DIR__."/../upgrades/airtime-1.8.2/airtime-upgrade.php");
 }
 if (strcmp($version, "1.9.0") < 0){
-    system("php ".__DIR__."/../upgrades/airtime-1.9/airtime-upgrade.php");
+    system("php ".__DIR__."/../upgrades/airtime-1.9.0/airtime-upgrade.php");
 }
 
 
diff --git a/install/upgrades/airtime-1.7/airtime-upgrade.php b/install/upgrades/airtime-1.7.0/airtime-upgrade.php
similarity index 100%
rename from install/upgrades/airtime-1.7/airtime-upgrade.php
rename to install/upgrades/airtime-1.7.0/airtime-upgrade.php
diff --git a/install/upgrades/airtime-1.8/airtime-upgrade.php b/install/upgrades/airtime-1.8.0/airtime-upgrade.php
similarity index 100%
rename from install/upgrades/airtime-1.8/airtime-upgrade.php
rename to install/upgrades/airtime-1.8.0/airtime-upgrade.php
diff --git a/install/upgrades/airtime-1.9/airtime-upgrade.php b/install/upgrades/airtime-1.9.0/airtime-upgrade.php
similarity index 100%
rename from install/upgrades/airtime-1.9/airtime-upgrade.php
rename to install/upgrades/airtime-1.9.0/airtime-upgrade.php
diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py b/python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
index 35d69e6f7..ef8fc0731 100644
--- a/python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
+++ b/python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
@@ -74,7 +74,7 @@ class AirtimeMediaMonitorBootstrap():
         all_files_set = set()
         for file_path in new_files:
             if len(file_path.strip(" \n")) > 0:
-                all_files_set.add(file_path[len(dir)+1:])           
+                all_files_set.add(file_path[len(dir):])           
         
         if os.path.exists(self.pe.timestamp_file):
             """find files that have been modified since the last time media-monitor process started."""
@@ -124,4 +124,4 @@ class AirtimeMediaMonitorBootstrap():
             file_path = "%s/%s" % (dir, file_path)
             if os.path.exists(file_path):
                 self.pe.handle_modified_file(False, os.path.basename(file_path), file_path)
-                                       
\ No newline at end of file
+