diff --git a/.ci/phpstan.neon b/.ci/phpstan.neon
index 17b67f5521..81ee55ec8b 100644
--- a/.ci/phpstan.neon
+++ b/.ci/phpstan.neon
@@ -15,6 +15,7 @@ parameters:
         paths:
             - ../app/Api/V1/Controllers/Data/DestroyController.php
             - ../app/Console/Commands/Correction/FixAccountTypes.php
+            - ../app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php
 
   paths:
     - ../app
@@ -24,4 +25,4 @@ parameters:
     - ../bootstrap/app.php
 
   # The level 8 is the highest level. original was 5
-  level: 3
+  level: 1
diff --git a/app/Console/Commands/Upgrade/BackToJournals.php b/app/Console/Commands/Upgrade/BackToJournals.php
index cc262bc2a2..31e862e035 100644
--- a/app/Console/Commands/Upgrade/BackToJournals.php
+++ b/app/Console/Commands/Upgrade/BackToJournals.php
@@ -148,12 +148,12 @@ class BackToJournals extends Command
      */
     private function getIdsForBudgets(): array
     {
-        $transactions = DB::table('budget_transaction')->distinct()->get(['transaction_id'])->pluck('transaction_id')->toArray();
+        $transactions = DB::table('budget_transaction')->distinct()->pluck('transaction_id')->toArray();
         $array        = [];
         $chunks       = array_chunk($transactions, 500);
 
         foreach ($chunks as $chunk) {
-            $set   = DB::table('transactions')->whereIn('transactions.id', $chunk)->get(['transaction_journal_id'])->pluck('transaction_journal_id')->toArray();
+            $set   = DB::table('transactions')->whereIn('transactions.id', $chunk)->pluck('transaction_journal_id')->toArray();
             $array = array_merge($array, $set);
         }
 
@@ -222,12 +222,12 @@ class BackToJournals extends Command
      */
     private function getIdsForCategories(): array
     {
-        $transactions = DB::table('category_transaction')->distinct()->get(['transaction_id'])->pluck('transaction_id')->toArray(); 
+        $transactions = DB::table('category_transaction')->distinct()->pluck('transaction_id')->toArray();
         $array        = [];
         $chunks       = array_chunk($transactions, 500);
 
         foreach ($chunks as $chunk) {
-            $set   = DB::table('transactions') 
+            $set   = DB::table('transactions')
                        ->whereIn('transactions.id', $chunk)
                        ->get(['transaction_journal_id'])->pluck('transaction_journal_id')->toArray();
             $array = array_merge($array, $set);
diff --git a/app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php b/app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php
index 0afedae36e..eb63e84f17 100644
--- a/app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php
+++ b/app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php
@@ -56,18 +56,12 @@ class OtherCurrenciesCorrections extends Command
      * @var string
      */
     protected $signature = 'firefly-iii:other-currencies {--F|force : Force the execution of this command.}';
-    /** @var array */
-    private $accountCurrencies;
-    /** @var AccountRepositoryInterface */
-    private $accountRepos;
-    /** @var JournalCLIRepositoryInterface */
-    private $cliRepos;
-    /** @var int */
-    private $count;
-    /** @var CurrencyRepositoryInterface */
-    private $currencyRepos;
-    /** @var JournalRepositoryInterface */
-    private $journalRepos;
+    private array $accountCurrencies;
+    private AccountRepositoryInterface $accountRepos;
+    private JournalCLIRepositoryInterface $cliRepos;
+    private int $count;
+    private CurrencyRepositoryInterface  $currencyRepos;
+    private JournalRepositoryInterface $journalRepos;
 
     /**
      * Execute the console command.
diff --git a/app/Exceptions/GracefulNotFoundHandler.php b/app/Exceptions/GracefulNotFoundHandler.php
index ae773d7b7a..01b5e7524d 100644
--- a/app/Exceptions/GracefulNotFoundHandler.php
+++ b/app/Exceptions/GracefulNotFoundHandler.php
@@ -147,7 +147,13 @@ class GracefulNotFoundHandler extends ExceptionHandler
         /** @var User $user */
         $user      = auth()->user();
         $route     = $request->route();
-        $accountId = (int) $route->parameter('account');
+        $param = $route->parameter('account');
+        if($param instanceof Account) {
+            $accountId = (int) $param->id;
+        }
+        if(!($param instanceof Account)) {
+            $accountId = (int) $param;
+        }
         /** @var Account $account */
         $account = $user->accounts()->with(['accountType'])->withTrashed()->find($accountId);
         if (null === $account) {