diff --git a/.gitignore b/.gitignore
index e0c8d883f5..d02d02ced3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,8 @@
 /resources/assets/bower
 /storage/*.key
 /storage/documents
+/storage/import
+/storage/migrations
 /bootstrap/compiled.php
 /bootstrap/environment.php
 /vendor
diff --git a/app/Console/Commands/ExportMigrations.php b/app/Console/Commands/ExportMigrations.php
index c05c4fb025..2ed9f42a92 100644
--- a/app/Console/Commands/ExportMigrations.php
+++ b/app/Console/Commands/ExportMigrations.php
@@ -68,7 +68,7 @@ class ExportMigrations extends Command
 
         $fileName = "{$accountKey}-{$date}-invoiceninja";
 
-        $data = [
+        $data['data'] = [
             'company' => $this->getCompany(),
             'users' => $this->getUsers(),
             'tax_rates' => $this->getTaxRates(),
diff --git a/app/Traits/GenerateMigrationResources.php b/app/Traits/GenerateMigrationResources.php
index c08ca2e6fe..63cd88fd67 100644
--- a/app/Traits/GenerateMigrationResources.php
+++ b/app/Traits/GenerateMigrationResources.php
@@ -879,7 +879,7 @@ trait GenerateMigrationResources
                 'invitation_id' => $payment->invitation_id,
                 'company_gateway_id' => $payment->account_gateway_id,
                 'type_id' => $payment->payment_type_id,
-                'status_id' => $payment->payment_status_id,
+                'status_id' => $this->transformPaymentStatus($payment),
                 'amount' => $payment->amount ?: 0,
                 'applied' => $payment->amount ?: 0,
                 'refunded' => $payment->refunded ?: 0,
@@ -899,6 +899,14 @@ trait GenerateMigrationResources
         return $transformed;
     }
 
+    private function transformPaymentStatus($payment)
+    {
+        if($payment->is_deleted && $payment->payment_status_id == 4)
+            return 2;
+
+        return $payment->payment_status_id;
+    }
+
     private function getCredits()
     {
         $credits = Credit::where('account_id', $this->account->id)->where('balance', '>', 0)->whereIsDeleted(false)
diff --git a/docs/index.rst b/docs/index.rst
index 0f4a6f6f14..96a830cd4d 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,4 +1,4 @@
-Invoice Ninja User Guide
+Invoice Ninja V4.x User Guide. For Version 5.x documentation, please go to <a href="https://invoiceninja.github.io">invoiceninja.github.io</a>
 ========================
 
 Want to find out everything there is to know about how to use your Invoice Ninja account? Look no further than our User Guide, where you’ll learn all about creating and sending invoices, receiving payments, creating tasks, converting quotes to invoices, recurring invoices, entering credits and much, much more.
diff --git a/storage/import/.gitignore b/storage/import/.gitignore
old mode 100755
new mode 100644
index d6b7ef32c8..e69de29bb2
--- a/storage/import/.gitignore
+++ b/storage/import/.gitignore
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/storage/migrations/.gitignore b/storage/migrations/.gitignore
index c96a04f008..e69de29bb2 100644
--- a/storage/migrations/.gitignore
+++ b/storage/migrations/.gitignore
@@ -1,2 +0,0 @@
-*
-!.gitignore
\ No newline at end of file