diff --git a/install_minimal/upgrades/airtime-2.1.0/data/upgrade.sql b/install_minimal/upgrades/airtime-2.1.0/data/upgrade.sql
index 10be08473..944fe27cd 100644
--- a/install_minimal/upgrades/airtime-2.1.0/data/upgrade.sql
+++ b/install_minimal/upgrades/airtime-2.1.0/data/upgrade.sql
@@ -106,6 +106,7 @@ ALTER TABLE cc_show_instances
 	ALTER COLUMN time_filled TYPE interval /* TYPE change - table: cc_show_instances original: time without time zone new: interval */,
 	ALTER COLUMN time_filled SET DEFAULT '00:00:00'::interval;
     
+UPDATE cc_show_instances SET time_filled = '00:00:00' WHERE time_filled is NULL;
 UPDATE cc_show_instances SET created = now();
 UPDATE cc_show_instances SET last_scheduled = now();
 
diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py b/python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
index 368b02fef..54c0a6170 100644
--- a/python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
+++ b/python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
@@ -77,6 +77,10 @@ class AirtimeMediaMonitorBootstrap():
     dir    -- pathname of the directory
     """
     def sync_database_to_filesystem(self, dir_id, dir):
+        
+        dir = os.path.normpath(dir)+"/"
+        
+        
         """
         set to hold new and/or modified files. We use a set to make it ok if files are added
         twice. This is because some of the tests for new files return result sets that are not