diff --git a/database/migrations/2017_06_17_214650_create_flights_table.php b/database/migrations/2017_06_17_214650_create_flights_table.php
index 0a0e4291..0fb73edd 100644
--- a/database/migrations/2017_06_17_214650_create_flights_table.php
+++ b/database/migrations/2017_06_17_214650_create_flights_table.php
@@ -56,5 +56,6 @@ class CreateFlightsTable extends Migration
     public function down()
     {
         Schema::drop('flights');
+        Schema::drop('flight_fields');
     }
 }
diff --git a/database/migrations/2017_06_23_011011_create_subfleets_table.php b/database/migrations/2017_06_23_011011_create_subfleets_table.php
index b95fc62b..77bcc357 100644
--- a/database/migrations/2017_06_23_011011_create_subfleets_table.php
+++ b/database/migrations/2017_06_23_011011_create_subfleets_table.php
@@ -47,7 +47,7 @@ class CreateSubfleetsTable extends Migration
 
         Schema::create('subfleet_flight', function(Blueprint $table) {
             $table->integer('subfleet_id')->unsigned();
-            $table->integer('flight_id')->unsigned();
+            $table->uuid('flight_id');
 
             $table->primary(['subfleet_id', 'flight_id']);
             $table->index(['flight_id', 'subfleet_id']);