diff --git a/front/php/templates/language/fr_fr.json b/front/php/templates/language/fr_fr.json
old mode 100644
new mode 100755
diff --git a/front/plugins/db_cleanup/script.py b/front/plugins/db_cleanup/script.py
index 1260ebb0..20bb7ce2 100755
--- a/front/plugins/db_cleanup/script.py
+++ b/front/plugins/db_cleanup/script.py
@@ -60,7 +60,7 @@ def cleanup_database (dbPath, DAYS_TO_KEEP_EVENTS, PHOLUS_DAYS_DATA, HRS_TO_KEEP
     mylog('verbose', [f'[{pluginName}] Upkeep Database:' ])
 
     # Connect to the App database
-    conn    = sqlite3.connect(dbPath)
+    conn    = sqlite3.connect(dbPath, timeout=30)
     cursor  = conn.cursor()
 
     # -----------------------------------------------------
@@ -149,7 +149,7 @@ def cleanup_database (dbPath, DAYS_TO_KEEP_EVENTS, PHOLUS_DAYS_DATA, HRS_TO_KEEP
     # Cleanup Offline Devices
     if HRS_TO_KEEP_OFFDEV != 0:
         mylog('verbose', [f'[{pluginName}] Devices: Delete all New Devices older than {str(HRS_TO_KEEP_OFFDEV)} hours (HRS_TO_KEEP_OFFDEV setting)'])            
-        query = f"""DELETE FROM Devices WHERE devPresentLastScan = 0 AND devLastConnection < date('now', '-{str(HRS_TO_KEEP_OFFDEV)} hour'))"""
+        query = f"""DELETE FROM Devices WHERE devPresentLastScan = 0 AND devLastConnection < date('now', '-{str(HRS_TO_KEEP_OFFDEV)} hour')"""
         mylog('verbose', [f'[{pluginName}] Query: {query} '])            
         cursor.execute (query) 
 
diff --git a/server/device.py b/server/device.py
index 6e5ef7d3..e2757f8f 100755
--- a/server/device.py
+++ b/server/device.py
@@ -439,8 +439,8 @@ def update_devices_data_from_scan (db):
     # Update VENDORS
     recordsToUpdate = []
     query = """SELECT * FROM Devices
-               WHERE devVendor = '(unknown)' OR devVendor =''
-                  OR devVendor IS NULL"""
+               WHERE devVendor IS NULL OR devVendor IN ("", "null", "(unknown)", "(Unknown)")
+            """
 
     for device in sql.execute (query) :
         vendor = query_MAC_vendor (device['devMac'])
@@ -469,8 +469,8 @@ def update_devices_data_from_scan (db):
     # Guess Type
     recordsToUpdate = []
     query = """SELECT * FROM Devices
-               WHERE devType in ('', 'null')
-                  OR devType IS NULL"""
+                    WHERE devType in ('', 'null')
+                OR devType IS NULL"""
     default_type = get_setting_value('NEWDEV_devType')
     
     for device in sql.execute (query) :