diff --git a/src/database/migrations/2017_02_04_133800_alter_calendar_operations.php b/src/database/migrations/2017_02_04_133800_alter_calendar_operations.php
index 6cac316..0831e93 100755
--- a/src/database/migrations/2017_02_04_133800_alter_calendar_operations.php
+++ b/src/database/migrations/2017_02_04_133800_alter_calendar_operations.php
@@ -32,6 +32,8 @@ public function up()
     public function down()
     {
         Schema::table('calendar_operations', function (Blueprint $table) {
+            $table->dropForeign(['staging_sys_id']);
+
             $table->dropColumn('staging_sys');
             $table->dropColumn('staging_sys_id');
             $table->dropColumn('staging_info');
diff --git a/src/database/migrations/2017_11_26_110800_update_settings_table.php b/src/database/migrations/2017_11_26_110800_update_settings_table.php
index 2f178ff..5f12f7e 100644
--- a/src/database/migrations/2017_11_26_110800_update_settings_table.php
+++ b/src/database/migrations/2017_11_26_110800_update_settings_table.php
@@ -116,13 +116,13 @@ public function down()
         if (is_null($settings['slack_integration']))
             $settings['slack_integration'] = 0;
 
-        $settings['slack_webhook'] = setting('kassie.calendar.slack_webhook', true);
+        $settings['slack_webhook'] = setting('kassie.calendar.slack_webhook', true) ?: '';
 
-        $settings['slack_emoji_importance_full'] = setting('kassie.calendar.slack_emoji_importance_full', true);
+        $settings['slack_emoji_importance_full'] = setting('kassie.calendar.slack_emoji_importance_full', true) ?: '';
 
-        $settings['slack_emoji_importance_half'] = setting('kassie.calendar.slack_emoji_importance_half', true);
+        $settings['slack_emoji_importance_half'] = setting('kassie.calendar.slack_emoji_importance_half', true) ?: '';
 
-        $settings['slack_emoji_importance_empty'] = setting('kassie.calendar.slack_emoji_importance_empty', true);
+        $settings['slack_emoji_importance_empty'] = setting('kassie.calendar.slack_emoji_importance_empty', true) ?: '';
 
         DB::table('calendar_settings')->insert($settings);
     }
diff --git a/src/database/migrations/2017_12_21_111200_create_paps_tables.php b/src/database/migrations/2017_12_21_111200_create_paps_tables.php
index af11612..dec2e43 100644
--- a/src/database/migrations/2017_12_21_111200_create_paps_tables.php
+++ b/src/database/migrations/2017_12_21_111200_create_paps_tables.php
@@ -46,4 +46,10 @@ public function up()
         });
     }
 
+    public function down()
+    {
+        Schema::dropIfExists('kassie_calendar_paps');
+        Schema::dropIfExists('kassie_calendar_esi_tokens');
+    }
+
 }
diff --git a/src/database/migrations/2018_01_03_172600_add_analytics.php b/src/database/migrations/2018_01_03_172600_add_analytics.php
index 25c1b00..ecf079e 100644
--- a/src/database/migrations/2018_01_03_172600_add_analytics.php
+++ b/src/database/migrations/2018_01_03_172600_add_analytics.php
@@ -35,7 +35,7 @@ public function down()
 
         Schema::table('kassie_calendar_paps', function(Blueprint $table){
 
-            $table->dropColumn('quantifier');
+            $table->dropColumn('value');
 
         });
     }