diff --git a/include/class.search.php b/include/class.search.php
index 74dc48638c2d5e7593eae4794aba5cf2a6d95544..a9ca110035d90bbd8b5153e26ba85f1ed202e3d3 100644
--- a/include/class.search.php
+++ b/include/class.search.php
@@ -280,7 +280,7 @@ class MysqlSearchBackend extends SearchBackend {
             . ', object_id='.db_input($id)
             . ', content='.db_input($content)
             . ', title='.db_input($title);
-        return db_query($sql);
+        return db_query($sql, false);
     }
 
     function delete($model) {
diff --git a/include/upgrader/streams/core/36f6b328-5cd0a25a.cleanup.sql b/include/upgrader/streams/core/36f6b328-5cd0a25a.cleanup.sql
index 3c93133c12d95e9d8699f8cc5870b30dd69e0324..5345ffbdd7d925b2a785c03e0a930190f350c59e 100644
--- a/include/upgrader/streams/core/36f6b328-5cd0a25a.cleanup.sql
+++ b/include/upgrader/streams/core/36f6b328-5cd0a25a.cleanup.sql
@@ -12,9 +12,6 @@ SET @s = (SELECT IF(
 PREPARE stmt FROM @s;
 EXECUTE stmt;
 
-ALTER TABLE `%TABLE_PREFIX%thread_entry`
-    DROP COLUMN `ticket_id`;
-
 DROP TABLE `%TABLE_PREFIX%ticket_attachment`;
 
 OPTIMIZE TABLE `%TABLE_PREFIX%ticket`;
diff --git a/include/upgrader/streams/core/435c62c3-2e7531a2.task.php b/include/upgrader/streams/core/435c62c3-2e7531a2.task.php
index 6a3832f08d960deeb0600ad56e3c62ec4855f52f..bdfb105b6d2fd3cc9de5b6aa6331ea63cb2dbe9e 100644
--- a/include/upgrader/streams/core/435c62c3-2e7531a2.task.php
+++ b/include/upgrader/streams/core/435c62c3-2e7531a2.task.php
@@ -2,6 +2,7 @@
 require_once INCLUDE_DIR.'class.migrater.php';
 
 // Replaced in v1.10 for STAFF_DEPT_TABLE
+define('GROUP_TABLE', TABLE_PREFIX.'groups');
 define('GROUP_DEPT_TABLE', TABLE_PREFIX.'group_dept_access');
 
 class MigrateGroupDeptAccess extends MigrationTask {
diff --git a/include/upgrader/streams/core/8f99b8bf-03ff59bf.cleanup.sql b/include/upgrader/streams/core/8f99b8bf-03ff59bf.cleanup.sql
index dbeb1fa39788d22ebe82ba7ef6c559d2de363bcf..3982ee61ebeb21a904e71152c2b3bd90754e379b 100644
--- a/include/upgrader/streams/core/8f99b8bf-03ff59bf.cleanup.sql
+++ b/include/upgrader/streams/core/8f99b8bf-03ff59bf.cleanup.sql
@@ -5,6 +5,6 @@ ALTER TABLE `%TABLE_PREFIX%ticket`
     DROP COLUMN `status`;
 
 -- Regenerate the CDATA table with the new format for 1.9.4
-DROP TABLE `%TABLE_PREFIX%ticket__cdata`;
+DROP TABLE IF EXISTS `%TABLE_PREFIX%ticket__cdata`;
 
 OPTIMIZE TABLE `%TABLE_PREFIX%ticket`;
diff --git a/include/upgrader/streams/core/9143a511-0d6099a6.cleanup.sql b/include/upgrader/streams/core/9143a511-0d6099a6.cleanup.sql
index 9597462e1f906207b921b12513a18924c0b71983..91793e7b6285005bb50dfe7119851b94a3fb50de 100644
--- a/include/upgrader/streams/core/9143a511-0d6099a6.cleanup.sql
+++ b/include/upgrader/streams/core/9143a511-0d6099a6.cleanup.sql
@@ -21,8 +21,8 @@ SET @s = (SELECT IF(
         AND table_schema = DATABASE()
         AND column_name = 'content_id'
     ) > 0,
-    "SELECT 1",
-    "ALTER TABLE `%TABLE_PREFIX%content` DROP `content_id`"
+    "ALTER TABLE `%TABLE_PREFIX%content` DROP `content_id`",
+    "SELECT 1"
 ));
 PREPARE stmt FROM @s;
 EXECUTE stmt;
@@ -35,8 +35,8 @@ SET @s = (SELECT IF(
         AND table_schema = DATABASE()
         AND column_name = 'sla_id'
     ) > 0,
-    "SELECT 1",
-    "ALTER TABLE `%TABLE_PREFIX%task` DROP `sla_id`"
+    "ALTER TABLE `%TABLE_PREFIX%task` DROP `sla_id`",
+    "SELECT 1"
 ));
 PREPARE stmt FROM @s;
 EXECUTE stmt;
diff --git a/include/upgrader/streams/core/f5692e24-4323a6a8.task.php b/include/upgrader/streams/core/f5692e24-4323a6a8.task.php
index 566fab7a20ad09887f6e59cd30ff73c630a09f17..7a22a16146700fbcd06679b494e3bcad62b536f7 100644
--- a/include/upgrader/streams/core/f5692e24-4323a6a8.task.php
+++ b/include/upgrader/streams/core/f5692e24-4323a6a8.task.php
@@ -29,9 +29,6 @@ class TemplateContentLoader extends MigrationTask {
                 .', created=NOW(), updated=NOW(), isactive=1';
             db_query($sql);
         }
-        // Set the content_id for all the new items
-        db_query('UPDATE '.PAGE_TABLE
-            .' SET `content_id` = `id` WHERE `content_id` = 0');
     }
 }
 return 'TemplateContentLoader';