diff --git a/include/upgrader/streams/core/2d590ffa-d9e311ad.patch.sql b/include/upgrader/streams/core/2d590ffa-d9e311ad.patch.sql
index e0a772da8a616c98cf72072f2b65322e710116fa..4bf8eb68df8b75e0a17d87b39ae0760c8cf94461 100644
--- a/include/upgrader/streams/core/2d590ffa-d9e311ad.patch.sql
+++ b/include/upgrader/streams/core/2d590ffa-d9e311ad.patch.sql
@@ -39,9 +39,9 @@ SELECT min(id) AS id FROM `%TABLE_PREFIX%thread_entry`
   WHERE type = 'M'
   GROUP BY thread_id;
 
-UPDATE `%TABLE_PREFIX%thread_entry`
-  SET `flags` = 1
-  WHERE `id` IN (SELECT `id` FROM `%TABLE_PREFIX%_orig_msg_ids`);
+UPDATE `%TABLE_PREFIX%thread_entry` A1
+  JOIN `%TABLE_PREFIX%_orig_msg_ids` A2 ON (A1.id = A2.id)
+  SET A1.`flags` = 1 ;
 
 DROP TABLE `%TABLE_PREFIX%_orig_msg_ids`;
 
diff --git a/include/upgrader/streams/core/5cd0a25a-2d590ffa.cleanup.sql b/include/upgrader/streams/core/5cd0a25a-2d590ffa.cleanup.sql
index 7d56ebf5329e120a84ac2d0c0b55381ad60332e8..409ff700c9de2ed17bb740b268cd37efa8a3c601 100644
--- a/include/upgrader/streams/core/5cd0a25a-2d590ffa.cleanup.sql
+++ b/include/upgrader/streams/core/5cd0a25a-2d590ffa.cleanup.sql
@@ -5,7 +5,7 @@
  */
 
 ALTER TABLE `%TABLE_PREFIX%help_topic`
-    DROP `form_id` int(10) unsigned NOT NULL default '0';
+    DROP `form_id`;
 
 ALTER TABLE `%TABLE_PREFIX%filter`
   DROP `reject_ticket`,
diff --git a/include/upgrader/streams/core/5cd0a25a-2d590ffa.patch.sql b/include/upgrader/streams/core/5cd0a25a-2d590ffa.patch.sql
index 01ec999ab03a153ec54ea85528fca4bc0de4a8c9..49ffc43951ad6a90037a46d23eb98c43429bfd13 100644
--- a/include/upgrader/streams/core/5cd0a25a-2d590ffa.patch.sql
+++ b/include/upgrader/streams/core/5cd0a25a-2d590ffa.patch.sql
@@ -130,9 +130,6 @@ insert into `%TABLE_PREFIX%help_topic_form`
     join `%TABLE_PREFIX%help_topic` A2
     where A1.`type` = 'T';
 
-ALTER TABLE `%TABLE_PREFIX%help_topic`
-    DROP `form_id` int(10) unsigned NOT NULL default '0';
-
 -- Finished with patch
 UPDATE `%TABLE_PREFIX%config`
     SET `value` = '2d590ffab4a6a928f08cc97aace1399e'