diff --git a/app/Jobs/Common/DeleteCompany.php b/app/Jobs/Common/DeleteCompany.php
index 7ec55ea20..c3cba7242 100644
--- a/app/Jobs/Common/DeleteCompany.php
+++ b/app/Jobs/Common/DeleteCompany.php
@@ -41,8 +41,8 @@ class DeleteCompany extends Job
 
         \DB::transaction(function () {
             $this->deleteRelationships($this->company, [
-                'accounts', 'documents', 'document_histories', 'document_items', 'document_item_taxes', 'document_totals', 'categories',
-                'contacts', 'currencies', 'dashboards', 'email_templates', 'items', 'modules', 'module_histories', 'reconciliations',
+                'accounts', 'document_histories', 'document_item_taxes', 'document_items', 'document_totals', 'documents', 'categories',
+                'contacts', 'currencies', 'dashboards', 'email_templates', 'items', 'module_histories', 'modules', 'reconciliations',
                 'recurring', 'reports', 'settings', 'taxes', 'transactions', 'transfers', 'widgets',
             ]);
 
diff --git a/app/Listeners/Update/V21/Version2112.php b/app/Listeners/Update/V21/Version2112.php
index d1e3be5f0..feac2ff73 100644
--- a/app/Listeners/Update/V21/Version2112.php
+++ b/app/Listeners/Update/V21/Version2112.php
@@ -36,7 +36,7 @@ class Version2112 extends Listener
 
     public function updateCompanies()
     {
-        $companies = Company::cursor();
+        $companies = Company::withTrashed()->cursor();
 
         foreach ($companies as $company) {
             $this->moveMedia($company);
diff --git a/config/filesystems.php b/config/filesystems.php
index 1169cfb93..ebe7d0dab 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -81,6 +81,7 @@ return [
 
         's3' => [
             'driver' => 's3',
+            'root' =>  env('AWS_ROOT'),
             'key' => env('AWS_ACCESS_KEY_ID'),
             'secret' => env('AWS_SECRET_ACCESS_KEY'),
             'region' => env('AWS_DEFAULT_REGION'),