diff --git a/.ci/phpmd/phpmd.xml b/.ci/phpmd/phpmd.xml
index 3053b2eb40..c2c1d23000 100644
--- a/.ci/phpmd/phpmd.xml
+++ b/.ci/phpmd/phpmd.xml
@@ -73,7 +73,7 @@
     <rule ref="rulesets/codesize.xml/ExcessiveMethodLength">
         <properties>
             <!-- TODO we want to be at a value of 40. But we start high, and drop the bar slowly. -->
-            <property name="minimum" value="400"/>
+            <property name="minimum" value="2000"/>
         </properties>
     </rule>
     <rule ref="rulesets/codesize.xml/ExcessiveParameterList">
diff --git a/app/Api/V2/Controllers/Chart/CategoryController.php b/app/Api/V2/Controllers/Chart/CategoryController.php
index d1443822a7..bf7d3f58c7 100644
--- a/app/Api/V2/Controllers/Chart/CategoryController.php
+++ b/app/Api/V2/Controllers/Chart/CategoryController.php
@@ -74,6 +74,7 @@ class CategoryController extends Controller
      *
      * @return JsonResponse
      * @throws FireflyException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function dashboard(DateRequest $request): JsonResponse
     {
diff --git a/app/Api/V2/Controllers/Model/Account/ShowController.php b/app/Api/V2/Controllers/Model/Account/ShowController.php
index 85a9845da2..8a06862753 100644
--- a/app/Api/V2/Controllers/Model/Account/ShowController.php
+++ b/app/Api/V2/Controllers/Model/Account/ShowController.php
@@ -40,7 +40,7 @@ class ShowController extends Controller
     /**
      * TODO this endpoint is not yet reachable.
      */
-    public function show(Request $request, Account $account): JsonResponse
+    public function show(Account $account): JsonResponse
     {
         $transformer = new AccountTransformer();
         $transformer->setParameters($this->parameters);
diff --git a/app/Api/V2/Controllers/Model/Bill/IndexController.php b/app/Api/V2/Controllers/Model/Bill/IndexController.php
index c36d00307c..3ded487161 100644
--- a/app/Api/V2/Controllers/Model/Bill/IndexController.php
+++ b/app/Api/V2/Controllers/Model/Bill/IndexController.php
@@ -61,13 +61,12 @@ class IndexController extends Controller
     }
 
     /**
-     * @param Request $request
      *
      * TODO see autocomplete/accountcontroller for list.
      *
      * @return JsonResponse
      */
-    public function index(Request $request): JsonResponse
+    public function index(): JsonResponse
     {
         $this->repository->correctOrder();
         $bills       = $this->repository->getBills();
diff --git a/app/Api/V2/Controllers/Model/Bill/ShowController.php b/app/Api/V2/Controllers/Model/Bill/ShowController.php
index 80d0573c23..2bee3060fc 100644
--- a/app/Api/V2/Controllers/Model/Bill/ShowController.php
+++ b/app/Api/V2/Controllers/Model/Bill/ShowController.php
@@ -63,7 +63,7 @@ class ShowController extends Controller
     /**
      * TODO this endpoint is not documented
      */
-    public function show(Request $request, Bill $bill): JsonResponse
+    public function show(Bill $bill): JsonResponse
     {
         $transformer = new BillTransformer();
         $transformer->setParameters($this->parameters);
diff --git a/app/Api/V2/Controllers/Model/Bill/SumController.php b/app/Api/V2/Controllers/Model/Bill/SumController.php
index 161dfdd4ce..7498025f01 100644
--- a/app/Api/V2/Controllers/Model/Bill/SumController.php
+++ b/app/Api/V2/Controllers/Model/Bill/SumController.php
@@ -69,6 +69,7 @@ class SumController extends Controller
      * @param DateRequest $request
      *
      * @return JsonResponse
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function paid(DateRequest $request): JsonResponse
     {
@@ -85,6 +86,7 @@ class SumController extends Controller
      * TODO see autocomplete/accountcontroller for list.
      *
      * @param DateRequest $request
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      *
      * @return JsonResponse
      */
diff --git a/app/Api/V2/Controllers/Model/Budget/IndexController.php b/app/Api/V2/Controllers/Model/Budget/IndexController.php
index 1ce89caf74..5cdceffbe9 100644
--- a/app/Api/V2/Controllers/Model/Budget/IndexController.php
+++ b/app/Api/V2/Controllers/Model/Budget/IndexController.php
@@ -54,11 +54,10 @@ class IndexController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v2)#/budgets/listBudgets
      *
-     * @param Request $request
      *
      * @return JsonResponse
      */
-    public function index(Request $request): JsonResponse
+    public function index(): JsonResponse
     {
         $pageSize   = $this->parameters->get('limit');
         $collection = $this->repository->getActiveBudgets();
diff --git a/app/Console/Commands/Upgrade/UpgradeCurrencyPreferences.php b/app/Console/Commands/Upgrade/UpgradeCurrencyPreferences.php
index 4a6c94c121..10bc9b78cf 100644
--- a/app/Console/Commands/Upgrade/UpgradeCurrencyPreferences.php
+++ b/app/Console/Commands/Upgrade/UpgradeCurrencyPreferences.php
@@ -150,6 +150,10 @@ class UpgradeCurrencyPreferences extends Command
     {
         $preference = Preference::where('user_id', $user->id)->where('name', 'currencyPreference')->first(['id', 'user_id', 'name', 'data', 'updated_at', 'created_at']);
 
+        if (null === $preference) {
+            return 'EUR';
+        }
+
         if (null !== $preference->data && !is_array($preference->data)) {
             return (string)$preference->data;
         }