diff --git a/include/upgrader/streams/core/0d6099a6-98ad7d55.cleanup.sql b/include/upgrader/streams/core/0d6099a6-98ad7d55.cleanup.sql
index 292d6052862923fb66985c45bcac37bd088fbafc..87d968fc081dec90374d2206bd8e1e5bd90e180c 100644
--- a/include/upgrader/streams/core/0d6099a6-98ad7d55.cleanup.sql
+++ b/include/upgrader/streams/core/0d6099a6-98ad7d55.cleanup.sql
@@ -32,7 +32,7 @@ SET @s = (SELECT IF(
         AND column_name = 'views'
     ) > 0,
     "SELECT 1",
-    "ALTER TABLE `%TABLE_PREFIX%faq` DROP `views`, DROP `score`;"
+    "ALTER TABLE `%TABLE_PREFIX%faq` DROP `views`, DROP `score`"
 ));
 PREPARE stmt FROM @s;
 EXECUTE stmt;
diff --git a/include/upgrader/streams/core/5cd0a25a-2d590ffa.task.php b/include/upgrader/streams/core/5cd0a25a-2d590ffa.task.php
index 7f529e727e3ede0464fff9b41eff55be5d91378f..34c59835bb94514662c264efbdbd6d4914e88e5e 100644
--- a/include/upgrader/streams/core/5cd0a25a-2d590ffa.task.php
+++ b/include/upgrader/streams/core/5cd0a25a-2d590ffa.task.php
@@ -6,6 +6,9 @@ class InstructionsPorter extends MigrationTask {
     function run($max_time) {
         foreach (DynamicForm::objects() as $F) {
             $F->instructions = Format::htmlchars($F->get('instructions'));
+            $F->save();
+        }
+        foreach (DynamicFormField::objects() as $F){
             $F->hint = Format::htmlchars($F->get('hint'));
             $F->save();
         }