diff --git a/.ci/phpstan.neon b/.ci/phpstan.neon
index a622c37e28..894bcdd555 100644
--- a/.ci/phpstan.neon
+++ b/.ci/phpstan.neon
@@ -69,5 +69,5 @@ parameters:
 
   # The level 8 is the highest level. original was 5
   # 7 is more than enough, higher just leaves NULL things.
-  level: 3
+  level: 4
 
diff --git a/app/Support/Steam.php b/app/Support/Steam.php
index 4dfc613d07..9f8d2118ca 100644
--- a/app/Support/Steam.php
+++ b/app/Support/Steam.php
@@ -370,7 +370,7 @@ class Steam
         //            $return['native_balance'] = $return['balance'];
         //        }
 
-        if (!$hasCurrency && array_key_exists('balance', $return) && array_key_exists('native_balance', $return)) {
+        if (!$hasCurrency && array_key_exists('balance', $return)) {
             //            Log::debug('Account has no currency preference, dropping balance in favor of native balance.');
             $sum                      = bcadd($return['balance'], $return['native_balance']);
             //            Log::debug(sprintf('%s + %s = %s', $return['balance'], $return['native_balance'], $sum));
diff --git a/app/TransactionRules/Actions/UpdatePiggyBank.php b/app/TransactionRules/Actions/UpdatePiggyBank.php
index 9368b9389c..4a4f00f35d 100644
--- a/app/TransactionRules/Actions/UpdatePiggyBank.php
+++ b/app/TransactionRules/Actions/UpdatePiggyBank.php
@@ -232,7 +232,7 @@ class UpdatePiggyBank implements ActionInterface
                 return true;
             }
         }
-        Log::debug(sprintf('Piggy bank is not connected to account #%d "%s"', $link?->id, $link?->name));
+        Log::debug(sprintf('Piggy bank is not connected to account #%d "%s"', $link->id, $link->name));
 
         return false;
     }
diff --git a/app/Transformers/V2/AccountTransformer.php b/app/Transformers/V2/AccountTransformer.php
index 54e351bc9c..28f6e96798 100644
--- a/app/Transformers/V2/AccountTransformer.php
+++ b/app/Transformers/V2/AccountTransformer.php
@@ -174,7 +174,9 @@ class AccountTransformer extends AbstractTransformer
 
     private function getBalanceDifference(Collection $accounts, Carbon $start, Carbon $end): void
     {
-        throw new FireflyException('Used deprecated method, rethink this.');
+        if (config('app.fallback_locale') === 'en_US') {
+            throw new FireflyException('Used deprecated method, rethink this.');
+        }
         // collect balances, start and end for both native and converted.
         // yes the b is usually used for boolean by idiots but here it's for balance.
         $bStart = [];
diff --git a/app/Transformers/V2/PiggyBankTransformer.php b/app/Transformers/V2/PiggyBankTransformer.php
index e48c48be28..19bccfb266 100644
--- a/app/Transformers/V2/PiggyBankTransformer.php
+++ b/app/Transformers/V2/PiggyBankTransformer.php
@@ -115,8 +115,9 @@ class PiggyBankTransformer extends AbstractTransformer
 
         // grab repetitions (for current amount):
         $repetitions         = PiggyBankRepetition::whereIn('piggy_bank_id', $piggyBanks)->get();
-
-        throw new FireflyException('[d] Piggy bank repetitions are EOL.');
+        if (config('app.fallback_locale') === 'en_US') {
+            throw new FireflyException('[d] Piggy bank repetitions are EOL.');
+        }
 
         /** @var PiggyBankRepetition $repetition */
         foreach ($repetitions as $repetition) {
diff --git a/app/Validation/Account/AccountValidatorProperties.php b/app/Validation/Account/AccountValidatorProperties.php
deleted file mode 100644
index 106c3660f5..0000000000
--- a/app/Validation/Account/AccountValidatorProperties.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * AccountValidatorProperties.php
- * Copyright (c) 2020 james@firefly-iii.org
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-declare(strict_types=1);
-
-namespace FireflyIII\Validation\Account;
-
-/**
- * I have no idea what made me do this. I'll reverse it some day.
- *
- * Trait AccountValidatorProperties
- */
-trait AccountValidatorProperties {}
diff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.php
index 9f3951168a..03d531750b 100644
--- a/app/Validation/FireflyValidator.php
+++ b/app/Validation/FireflyValidator.php
@@ -71,7 +71,7 @@ class FireflyValidator extends Validator
             return false;
         }
         $secretPreference = app('preferences')->get('temp-mfa-secret');
-        $secret           = $secretPreference?->data ?? '';
+        $secret           = $secretPreference->data ?? '';
         if (is_array($secret)) {
             $secret = '';
         }