diff --git a/src/Acl/AccessManager.php b/src/Acl/AccessManager.php
index b30426ecaae4b1de99ee0ded276169b6128cbb1c..80ede5e9be407e44d781cb599f64ef92cde8b7bc 100644
--- a/src/Acl/AccessManager.php
+++ b/src/Acl/AccessManager.php
@@ -42,7 +42,7 @@ trait AccessManager
      * @param  int  $role_id
      * @return \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Eloquent\Collection
      */
-    public function getCompleteRole(int $role_id = null)
+    public function getCompleteRole(?int $role_id = null)
     {
 
         $roles = RoleModel::with('permissions', 'users');
diff --git a/src/Http/Controllers/Character/MailController.php b/src/Http/Controllers/Character/MailController.php
index cad3c133fc98d3ed67a734cd90e4f7c69dc4cde2..0707d929ae1cf530de94b2fdce0a418bb56ed38a 100644
--- a/src/Http/Controllers/Character/MailController.php
+++ b/src/Http/Controllers/Character/MailController.php
@@ -130,7 +130,7 @@ class MailController extends Controller
      * @param  int  $message_id
      * @return mixed
      */
-    private function getCharacterMailTimeline(int $message_id = null)
+    private function getCharacterMailTimeline(?int $message_id = null)
     {
         // Get the User for permissions and affiliation
         // checks
diff --git a/src/Http/Controllers/Corporation/MiningLedgerController.php b/src/Http/Controllers/Corporation/MiningLedgerController.php
index 15fe9950efbc5aee8ef38db6bbd0b6899171a2fe..91d504f312a8e946d98aa1e50bd61193dc992f84 100644
--- a/src/Http/Controllers/Corporation/MiningLedgerController.php
+++ b/src/Http/Controllers/Corporation/MiningLedgerController.php
@@ -40,7 +40,7 @@ class MiningLedgerController extends Controller
      * @param  \Seat\Web\Http\DataTables\Corporation\Industrial\MiningDataTable  $dataTable
      * @return mixed
      */
-    public function index(CorporationInfo $corporation, MiningDataTable $dataTable, int $year = null, int $month = null)
+    public function index(CorporationInfo $corporation, MiningDataTable $dataTable, ?int $year = null, ?int $month = null)
     {
         if (is_null($year)) $year = carbon()->year;
 
diff --git a/src/Http/Controllers/Squads/ApplicationsController.php b/src/Http/Controllers/Squads/ApplicationsController.php
index 5f4b6db979b66eda83385716f999ad8e969194b5..6b48d445e510928f8f93124c7bb82976bcccaae7 100644
--- a/src/Http/Controllers/Squads/ApplicationsController.php
+++ b/src/Http/Controllers/Squads/ApplicationsController.php
@@ -64,8 +64,8 @@ class ApplicationsController extends Controller
      */
     public function store(Request $request, Squad $squad)
     {
-        if(!$squad->isUserEligible(auth()->user())) {
-            return redirect()->back()->with('error','You are not eligible for this squad!');
+        if(! $squad->isUserEligible(auth()->user())) {
+            return redirect()->back()->with('error', 'You are not eligible for this squad!');
         }
 
         // in case the squad is manual and does not contain any moderator
@@ -112,8 +112,8 @@ class ApplicationsController extends Controller
     {
         $application = SquadApplication::with('squad', 'user')->find($id);
 
-        if(!$squad->isUserEligible($application->user)) {
-            return redirect()->back()->with('error','The applicant is not eligible for this squad!');
+        if(! $squad->isUserEligible($application->user)) {
+            return redirect()->back()->with('error', 'The applicant is not eligible for this squad!');
         }
 
         $squad->members()->save($application->user);