diff --git a/app/Config/Events.php b/app/Config/Events.php
index bedbc5bd..8da203d0 100644
--- a/app/Config/Events.php
+++ b/app/Config/Events.php
@@ -29,7 +29,7 @@ use CodeIgniter\HotReloader\HotReloader;
  *      Events::on('create', [$myInstance, 'myMethod']);
  */
 
-Events::on('pre_system', static function () {
+Events::on('pre_system', static function (): void {
     if (ENVIRONMENT !== 'testing') {
         if (ini_get('zlib.output_compression')) {
             throw FrameworkException::forEnabledZlibOutputCompression();
diff --git a/app/Models/ClipModel.php b/app/Models/ClipModel.php
index 68f531f4..819d8e42 100644
--- a/app/Models/ClipModel.php
+++ b/app/Models/ClipModel.php
@@ -91,11 +91,10 @@ class ClipModel extends Model
         if (! ($found = cache($cacheName))) {
             $clip = $this->find($videoClipId);
 
-            if ($clip === null) {
+            if (! $clip instanceof BaseClip) {
                 return null;
             }
 
-            // @phpstan-ignore-next-line
             $found = new VideoClip($clip->toArray());
 
             cache()
@@ -123,6 +122,7 @@ class ClipModel extends Model
             $found[$key] = new VideoClip($videoClip->toArray());
         }
 
+        // @phpstan-ignore-next-line
         return $found;
     }
 
@@ -185,11 +185,10 @@ class ClipModel extends Model
         if (! ($found = cache($cacheName))) {
             $clip = $this->find($soundbiteId);
 
-            if ($clip === null) {
+            if (! $clip instanceof BaseClip) {
                 return null;
             }
 
-            // @phpstan-ignore-next-line
             $found = new Soundbite($clip->toArray());
 
             cache()
diff --git a/app/Models/LikeModel.php b/app/Models/LikeModel.php
index a2b100aa..b0b222ff 100644
--- a/app/Models/LikeModel.php
+++ b/app/Models/LikeModel.php
@@ -162,7 +162,7 @@ class LikeModel extends UuidModel
                 'comment_id' => service('uuid')
                     ->fromString($comment->id)
                     ->getBytes(),
-            ])->first()
+            ])->first() instanceof Like
         ) {
             $this->removeLike($actor, $comment);
         } else {
diff --git a/composer.json b/composer.json
index 474065a9..7a3e0a0a 100644
--- a/composer.json
+++ b/composer.json
@@ -17,25 +17,25 @@
     "opawg/user-agents-php": "^v1.0",
     "adaures/ipcat-php": "^v1.0.0",
     "adaures/podcast-persons-taxonomy": "^v1.0.1",
-    "phpseclib/phpseclib": "~2.0.44",
+    "phpseclib/phpseclib": "~2.0.45",
     "michalsn/codeigniter4-uuid": "v1.0.2",
     "codeigniter4/settings": "v2.1.2",
     "chrisjean/php-ico": "^1.0.4",
     "melbahja/seo": "^v2.1.1",
     "codeigniter4/shield": "v1.0.0-beta.6",
-    "aws/aws-sdk-php": "^3.281.3",
+    "aws/aws-sdk-php": "^3.281.12",
     "mpratt/embera": "^2.0.34",
     "codeigniter4/tasks": "dev-develop",
     "yassinedoghri/podcast-feed": "dev-main"
   },
   "require-dev": {
     "captainhook/captainhook": "^5.16.4",
-    "codeigniter/phpstan-codeigniter": "^1.0.1",
+    "codeigniter/phpstan-codeigniter": "^v1.3.0",
     "mikey179/vfsstream": "^v1.6.11",
     "phpstan/extension-installer": "^1.3.1",
-    "phpstan/phpstan": "^1.10.33",
-    "phpunit/phpunit": "^10.3.3",
-    "rector/rector": "^0.18.2",
+    "phpstan/phpstan": "^1.10.35",
+    "phpunit/phpunit": "^10.3.5",
+    "rector/rector": "^0.18.3",
     "symplify/coding-standard": "^12.0.3",
     "symplify/easy-coding-standard": "^12.0.8"
   },
diff --git a/composer.lock b/composer.lock
index ec4f75d0..308671d8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
     "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
     "This file is @generated automatically"
   ],
-  "content-hash": "6fe4f69b336852b20244b63f5038f315",
+  "content-hash": "2f7475f224d54face5bb527c0edc893a",
   "packages": [
     {
       "name": "adaures/ipcat-php",
@@ -120,16 +120,16 @@
     },
     {
       "name": "aws/aws-sdk-php",
-      "version": "3.281.3",
+      "version": "3.281.12",
       "source": {
         "type": "git",
         "url": "https://github.com/aws/aws-sdk-php.git",
-        "reference": "a3cfb20dbfb11117b7174b2594fc597745252e0c"
+        "reference": "22a92f08758db2b152843ea0875eeee5a467d8ff"
       },
       "dist": {
         "type": "zip",
-        "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/a3cfb20dbfb11117b7174b2594fc597745252e0c",
-        "reference": "a3cfb20dbfb11117b7174b2594fc597745252e0c",
+        "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/22a92f08758db2b152843ea0875eeee5a467d8ff",
+        "reference": "22a92f08758db2b152843ea0875eeee5a467d8ff",
         "shasum": ""
       },
       "require": {
@@ -205,9 +205,9 @@
       "support": {
         "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
         "issues": "https://github.com/aws/aws-sdk-php/issues",
-        "source": "https://github.com/aws/aws-sdk-php/tree/3.281.3"
+        "source": "https://github.com/aws/aws-sdk-php/tree/3.281.12"
       },
-      "time": "2023-09-08T18:06:26+00:00"
+      "time": "2023-09-22T18:12:27+00:00"
     },
     {
       "name": "brick/math",
@@ -494,12 +494,12 @@
       "source": {
         "type": "git",
         "url": "https://github.com/codeigniter4/tasks.git",
-        "reference": "9d898e01bf2c39349c9b2e84512dfbf0f40aaac9"
+        "reference": "72d8f02a4293949f5aaeb80897eb431663c2293a"
       },
       "dist": {
         "type": "zip",
-        "url": "https://api.github.com/repos/codeigniter4/tasks/zipball/9d898e01bf2c39349c9b2e84512dfbf0f40aaac9",
-        "reference": "9d898e01bf2c39349c9b2e84512dfbf0f40aaac9",
+        "url": "https://api.github.com/repos/codeigniter4/tasks/zipball/72d8f02a4293949f5aaeb80897eb431663c2293a",
+        "reference": "72d8f02a4293949f5aaeb80897eb431663c2293a",
         "shasum": ""
       },
       "require": {
@@ -510,7 +510,7 @@
       "require-dev": {
         "codeigniter4/devkit": "^1.0",
         "codeigniter4/framework": "^4.1",
-        "rector/rector": "0.18.2"
+        "rector/rector": "0.18.3"
       },
       "default-branch": true,
       "type": "library",
@@ -527,24 +527,30 @@
       },
       "scripts": {
         "post-update-cmd": ["bash admin/setup.sh"],
-        "analyze": ["phpstan analyze", "psalm"],
+        "analyze": [
+          "Composer\\Config::disableProcessTimeout",
+          "phpstan analyze",
+          "psalm",
+          "rector process --dry-run"
+        ],
+        "sa": ["@analyze"],
         "ci": [
           "Composer\\Config::disableProcessTimeout",
+          "@cs",
           "@deduplicate",
-          "@analyze",
-          "@test",
           "@inspect",
-          "rector process",
-          "@style"
+          "@analyze",
+          "@test"
         ],
-        "deduplicate": ["phpcpd app/ src/"],
+        "cs": ["php-cs-fixer fix --ansi --verbose --dry-run --diff"],
+        "cs-fix": ["php-cs-fixer fix --ansi --verbose --diff"],
+        "style": ["@cs-fix"],
+        "deduplicate": ["phpcpd src/ tests/"],
         "inspect": ["deptrac analyze --cache-file=build/deptrac.cache"],
         "mutate": [
           "infection --threads=2 --skip-initial-tests --coverage=build/phpunit"
         ],
         "retool": ["retool"],
-        "style": ["php-cs-fixer fix --verbose --ansi --using-cache=no"],
-        "cs-fix": ["@style"],
         "test": ["phpunit"]
       },
       "license": ["MIT"],
@@ -562,7 +568,7 @@
         "source": "https://github.com/codeigniter4/tasks/tree/develop",
         "issues": "https://github.com/codeigniter4/tasks/issues"
       },
-      "time": "2023-09-09T10:30:12+00:00"
+      "time": "2023-09-13T12:19:31+00:00"
     },
     {
       "name": "composer/ca-bundle",
@@ -2092,16 +2098,16 @@
     },
     {
       "name": "phpseclib/phpseclib",
-      "version": "2.0.44",
+      "version": "2.0.45",
       "source": {
         "type": "git",
         "url": "https://github.com/phpseclib/phpseclib.git",
-        "reference": "149f608243f8133c61926aae26ce67d2b22b37e5"
+        "reference": "28d8f438a0064c9de80857e3270d071495544640"
       },
       "dist": {
         "type": "zip",
-        "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/149f608243f8133c61926aae26ce67d2b22b37e5",
-        "reference": "149f608243f8133c61926aae26ce67d2b22b37e5",
+        "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/28d8f438a0064c9de80857e3270d071495544640",
+        "reference": "28d8f438a0064c9de80857e3270d071495544640",
         "shasum": ""
       },
       "require": {
@@ -2178,7 +2184,7 @@
       ],
       "support": {
         "issues": "https://github.com/phpseclib/phpseclib/issues",
-        "source": "https://github.com/phpseclib/phpseclib/tree/2.0.44"
+        "source": "https://github.com/phpseclib/phpseclib/tree/2.0.45"
       },
       "funding": [
         {
@@ -2194,7 +2200,7 @@
           "type": "tidelift"
         }
       ],
-      "time": "2023-06-13T08:41:47+00:00"
+      "time": "2023-09-15T20:55:47+00:00"
     },
     {
       "name": "psr/cache",
@@ -2285,16 +2291,16 @@
     },
     {
       "name": "psr/http-client",
-      "version": "1.0.2",
+      "version": "1.0.3",
       "source": {
         "type": "git",
         "url": "https://github.com/php-fig/http-client.git",
-        "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31"
+        "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90"
       },
       "dist": {
         "type": "zip",
-        "url": "https://api.github.com/repos/php-fig/http-client/zipball/0955afe48220520692d2d09f7ab7e0f93ffd6a31",
-        "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31",
+        "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90",
+        "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90",
         "shasum": ""
       },
       "require": {
@@ -2324,9 +2330,9 @@
       "homepage": "https://github.com/php-fig/http-client",
       "keywords": ["http", "http-client", "psr", "psr-18"],
       "support": {
-        "source": "https://github.com/php-fig/http-client/tree/1.0.2"
+        "source": "https://github.com/php-fig/http-client"
       },
-      "time": "2023-04-10T20:12:12+00:00"
+      "time": "2023-09-23T14:17:50+00:00"
     },
     {
       "name": "psr/http-factory",
@@ -3225,20 +3231,20 @@
     },
     {
       "name": "codeigniter/phpstan-codeigniter",
-      "version": "v1.0.1",
+      "version": "v1.3.0.70400",
       "source": {
         "type": "git",
         "url": "https://github.com/CodeIgniter/phpstan-codeigniter.git",
-        "reference": "de64b5e634322f929518d976e5f8cf9303fcd9c6"
+        "reference": "efa4ebc6afca005619849f34f8ea2d16442bd33e"
       },
       "dist": {
         "type": "zip",
-        "url": "https://api.github.com/repos/CodeIgniter/phpstan-codeigniter/zipball/de64b5e634322f929518d976e5f8cf9303fcd9c6",
-        "reference": "de64b5e634322f929518d976e5f8cf9303fcd9c6",
+        "url": "https://api.github.com/repos/CodeIgniter/phpstan-codeigniter/zipball/efa4ebc6afca005619849f34f8ea2d16442bd33e",
+        "reference": "efa4ebc6afca005619849f34f8ea2d16442bd33e",
         "shasum": ""
       },
       "require": {
-        "php": "^8.1",
+        "php": "^7.4 || ^8.0",
         "phpstan/phpstan": "^1.10"
       },
       "conflict": {
@@ -3247,13 +3253,15 @@
       "require-dev": {
         "codeigniter/coding-standard": "^1.7",
         "codeigniter4/framework": "^4.3",
+        "codeigniter4/shield": "^1.0@beta",
         "friendsofphp/php-cs-fixer": "^3.20",
         "nexusphp/cs-config": "^3.12",
         "phpstan/extension-installer": "^1.3",
         "phpstan/phpstan-deprecation-rules": "^1.1",
         "phpstan/phpstan-phpunit": "^1.3",
         "phpstan/phpstan-strict-rules": "^1.5",
-        "phpunit/phpunit": "^10.2"
+        "phpunit/phpunit": "^10.2",
+        "rector/rector": "^0.18.2"
       },
       "type": "phpstan-extension",
       "extra": {
@@ -3288,7 +3296,7 @@
         "slack": "https://codeigniterchat.slack.com",
         "source": "https://github.com/CodeIgniter/phpstan-codeigniter"
       },
-      "time": "2023-08-30T06:35:08+00:00"
+      "time": "2023-09-18T09:38:34+00:00"
     },
     {
       "name": "composer/pcre",
@@ -3491,16 +3499,16 @@
     },
     {
       "name": "friendsofphp/php-cs-fixer",
-      "version": "v3.26.1",
+      "version": "v3.28.0",
       "source": {
         "type": "git",
         "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-        "reference": "d023ba6684055f6ea1da1352d8a02baca0426983"
+        "reference": "113e09fea3d2306319ffaa2423fe3de768b28cff"
       },
       "dist": {
         "type": "zip",
-        "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/d023ba6684055f6ea1da1352d8a02baca0426983",
-        "reference": "d023ba6684055f6ea1da1352d8a02baca0426983",
+        "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/113e09fea3d2306319ffaa2423fe3de768b28cff",
+        "reference": "113e09fea3d2306319ffaa2423fe3de768b28cff",
         "shasum": ""
       },
       "require": {
@@ -3570,7 +3578,7 @@
       ],
       "support": {
         "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-        "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.26.1"
+        "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.28.0"
       },
       "funding": [
         {
@@ -3578,7 +3586,7 @@
           "type": "github"
         }
       ],
-      "time": "2023-09-08T19:09:07+00:00"
+      "time": "2023-09-22T20:43:40+00:00"
     },
     {
       "name": "mikey179/vfsstream",
@@ -3874,16 +3882,16 @@
     },
     {
       "name": "phpstan/phpstan",
-      "version": "1.10.33",
+      "version": "1.10.35",
       "source": {
         "type": "git",
         "url": "https://github.com/phpstan/phpstan.git",
-        "reference": "03b1cf9f814ba0863c4e9affea49a4d1ed9a2ed1"
+        "reference": "e730e5facb75ffe09dfb229795e8c01a459f26c3"
       },
       "dist": {
         "type": "zip",
-        "url": "https://api.github.com/repos/phpstan/phpstan/zipball/03b1cf9f814ba0863c4e9affea49a4d1ed9a2ed1",
-        "reference": "03b1cf9f814ba0863c4e9affea49a4d1ed9a2ed1",
+        "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e730e5facb75ffe09dfb229795e8c01a459f26c3",
+        "reference": "e730e5facb75ffe09dfb229795e8c01a459f26c3",
         "shasum": ""
       },
       "require": {
@@ -3922,20 +3930,20 @@
           "type": "tidelift"
         }
       ],
-      "time": "2023-09-04T12:20:53+00:00"
+      "time": "2023-09-19T15:27:56+00:00"
     },
     {
       "name": "phpunit/php-code-coverage",
-      "version": "10.1.4",
+      "version": "10.1.6",
       "source": {
         "type": "git",
         "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-        "reference": "cd59bb34756a16ca8253ce9b2909039c227fff71"
+        "reference": "56f33548fe522c8d82da7ff3824b42829d324364"
       },
       "dist": {
         "type": "zip",
-        "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/cd59bb34756a16ca8253ce9b2909039c227fff71",
-        "reference": "cd59bb34756a16ca8253ce9b2909039c227fff71",
+        "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/56f33548fe522c8d82da7ff3824b42829d324364",
+        "reference": "56f33548fe522c8d82da7ff3824b42829d324364",
         "shasum": ""
       },
       "require": {
@@ -3984,7 +3992,7 @@
       "support": {
         "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
         "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-        "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.4"
+        "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.6"
       },
       "funding": [
         {
@@ -3992,7 +4000,7 @@
           "type": "github"
         }
       ],
-      "time": "2023-08-31T14:04:38+00:00"
+      "time": "2023-09-19T04:59:03+00:00"
     },
     {
       "name": "phpunit/php-file-iterator",
@@ -4214,16 +4222,16 @@
     },
     {
       "name": "phpunit/phpunit",
-      "version": "10.3.3",
+      "version": "10.3.5",
       "source": {
         "type": "git",
         "url": "https://github.com/sebastianbergmann/phpunit.git",
-        "reference": "241ed4dd0db1c096984e62d414c4e1ac8d5dbff4"
+        "reference": "747c3b2038f1139e3dcd9886a3f5a948648b7503"
       },
       "dist": {
         "type": "zip",
-        "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/241ed4dd0db1c096984e62d414c4e1ac8d5dbff4",
-        "reference": "241ed4dd0db1c096984e62d414c4e1ac8d5dbff4",
+        "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/747c3b2038f1139e3dcd9886a3f5a948648b7503",
+        "reference": "747c3b2038f1139e3dcd9886a3f5a948648b7503",
         "shasum": ""
       },
       "require": {
@@ -4237,7 +4245,7 @@
         "phar-io/manifest": "^2.0.3",
         "phar-io/version": "^3.0.2",
         "php": ">=8.1",
-        "phpunit/php-code-coverage": "^10.1.1",
+        "phpunit/php-code-coverage": "^10.1.5",
         "phpunit/php-file-iterator": "^4.0",
         "phpunit/php-invoker": "^4.0",
         "phpunit/php-text-template": "^3.0",
@@ -4247,7 +4255,7 @@
         "sebastian/comparator": "^5.0",
         "sebastian/diff": "^5.0",
         "sebastian/environment": "^6.0",
-        "sebastian/exporter": "^5.0",
+        "sebastian/exporter": "^5.1",
         "sebastian/global-state": "^6.0.1",
         "sebastian/object-enumerator": "^5.0",
         "sebastian/recursion-context": "^5.0",
@@ -4283,7 +4291,7 @@
       "support": {
         "issues": "https://github.com/sebastianbergmann/phpunit/issues",
         "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-        "source": "https://github.com/sebastianbergmann/phpunit/tree/10.3.3"
+        "source": "https://github.com/sebastianbergmann/phpunit/tree/10.3.5"
       },
       "funding": [
         {
@@ -4299,7 +4307,7 @@
           "type": "tidelift"
         }
       ],
-      "time": "2023-09-05T04:34:51+00:00"
+      "time": "2023-09-19T05:42:37+00:00"
     },
     {
       "name": "psr/container",
@@ -4354,16 +4362,16 @@
     },
     {
       "name": "rector/rector",
-      "version": "0.18.2",
+      "version": "0.18.3",
       "source": {
         "type": "git",
         "url": "https://github.com/rectorphp/rector.git",
-        "reference": "8606564b50ce70f99839d35c67f4536dc2ea090d"
+        "reference": "ba7988e3e028e68e07191d75b0d5473ac320c5e7"
       },
       "dist": {
         "type": "zip",
-        "url": "https://api.github.com/repos/rectorphp/rector/zipball/8606564b50ce70f99839d35c67f4536dc2ea090d",
-        "reference": "8606564b50ce70f99839d35c67f4536dc2ea090d",
+        "url": "https://api.github.com/repos/rectorphp/rector/zipball/ba7988e3e028e68e07191d75b0d5473ac320c5e7",
+        "reference": "ba7988e3e028e68e07191d75b0d5473ac320c5e7",
         "shasum": ""
       },
       "require": {
@@ -4387,7 +4395,7 @@
       "keywords": ["automation", "dev", "migration", "refactoring"],
       "support": {
         "issues": "https://github.com/rectorphp/rector/issues",
-        "source": "https://github.com/rectorphp/rector/tree/0.18.2"
+        "source": "https://github.com/rectorphp/rector/tree/0.18.3"
       },
       "funding": [
         {
@@ -4395,7 +4403,7 @@
           "type": "github"
         }
       ],
-      "time": "2023-09-06T08:50:38+00:00"
+      "time": "2023-09-12T20:18:14+00:00"
     },
     {
       "name": "sebastian/cli-parser",
@@ -4791,16 +4799,16 @@
     },
     {
       "name": "sebastian/exporter",
-      "version": "5.0.1",
+      "version": "5.1.0",
       "source": {
         "type": "git",
         "url": "https://github.com/sebastianbergmann/exporter.git",
-        "reference": "32ff03d078fed1279c4ec9a407d08c5e9febb480"
+        "reference": "c3fa8483f9539b190f7cd4bfc4a07631dd1df344"
       },
       "dist": {
         "type": "zip",
-        "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/32ff03d078fed1279c4ec9a407d08c5e9febb480",
-        "reference": "32ff03d078fed1279c4ec9a407d08c5e9febb480",
+        "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/c3fa8483f9539b190f7cd4bfc4a07631dd1df344",
+        "reference": "c3fa8483f9539b190f7cd4bfc4a07631dd1df344",
         "shasum": ""
       },
       "require": {
@@ -4850,7 +4858,7 @@
       "support": {
         "issues": "https://github.com/sebastianbergmann/exporter/issues",
         "security": "https://github.com/sebastianbergmann/exporter/security/policy",
-        "source": "https://github.com/sebastianbergmann/exporter/tree/5.0.1"
+        "source": "https://github.com/sebastianbergmann/exporter/tree/5.1.0"
       },
       "funding": [
         {
@@ -4858,7 +4866,7 @@
           "type": "github"
         }
       ],
-      "time": "2023-09-08T04:46:58+00:00"
+      "time": "2023-09-18T07:15:37+00:00"
     },
     {
       "name": "sebastian/global-state",
diff --git a/modules/Admin/Controllers/EpisodeController.php b/modules/Admin/Controllers/EpisodeController.php
index 58933535..4b60b4fd 100644
--- a/modules/Admin/Controllers/EpisodeController.php
+++ b/modules/Admin/Controllers/EpisodeController.php
@@ -50,7 +50,7 @@ class EpisodeController extends BaseController
                         'id'         => $params[1],
                         'podcast_id' => $params[0],
                     ])
-                    ->first())
+                    ->first()) instanceof Episode
             ) {
                 throw PageNotFoundException::forPageNotFound();
             }
@@ -182,7 +182,7 @@ class EpisodeController extends BaseController
                 'slug'       => $validData['slug'],
                 'podcast_id' => $this->podcast->id,
             ])
-            ->first()) {
+            ->first() instanceof Episode) {
             return redirect()
                 ->back()
                 ->withInput()
diff --git a/modules/Admin/Controllers/NotificationController.php b/modules/Admin/Controllers/NotificationController.php
index f4c2c64a..33c7d9ac 100644
--- a/modules/Admin/Controllers/NotificationController.php
+++ b/modules/Admin/Controllers/NotificationController.php
@@ -41,7 +41,7 @@ class NotificationController extends BaseController
                     ->where([
                         'id' => $params[1],
                     ])
-                    ->first())
+                    ->first()) instanceof Notification
             ) {
                 throw PageNotFoundException::forPageNotFound();
             }
diff --git a/modules/Admin/Controllers/PageController.php b/modules/Admin/Controllers/PageController.php
index fbd909d9..f589f64c 100644
--- a/modules/Admin/Controllers/PageController.php
+++ b/modules/Admin/Controllers/PageController.php
@@ -25,7 +25,7 @@ class PageController extends BaseController
             return $this->{$method}();
         }
 
-        if ($this->page = (new PageModel())->find($params[0])) {
+        if (($this->page = (new PageModel())->find($params[0])) instanceof Page) {
             return $this->{$method}();
         }
 
diff --git a/modules/Admin/Controllers/PodcastController.php b/modules/Admin/Controllers/PodcastController.php
index 7cf5618e..3eece8b7 100644
--- a/modules/Admin/Controllers/PodcastController.php
+++ b/modules/Admin/Controllers/PodcastController.php
@@ -716,7 +716,7 @@ class PodcastController extends BaseController
             $post = (new PostModel())->where('episode_id', $episode->id)
                 ->first();
 
-            if ($post !== null) {
+            if ($post instanceof Post) {
                 $post->published_at = $episode->published_at;
                 $postModel = new PostModel();
                 if (! $postModel->update($post->id, $post)) {
@@ -819,7 +819,7 @@ class PodcastController extends BaseController
 
         $newPostMessage = $this->request->getPost('message');
 
-        if ($post !== null) {
+        if ($post instanceof Post) {
             if ($newPostMessage !== '') {
                 // edit post if post exists and message is not empty
                 $post->message = $newPostMessage;
@@ -884,7 +884,7 @@ class PodcastController extends BaseController
             $post = (new PostModel())->where('episode_id', $episode->id)
                 ->first();
 
-            if ($post !== null) {
+            if ($post instanceof Post) {
                 $post->published_at = $episode->published_at;
                 $postModel = new PostModel();
                 if (! $postModel->update($post->id, $post)) {
@@ -927,7 +927,7 @@ class PodcastController extends BaseController
                 'episode_id' => null,
             ])
             ->first();
-        if ($post !== null) {
+        if ($post instanceof Post) {
             $postModel->removePost($post);
         }
 
diff --git a/modules/Admin/Controllers/SoundbiteController.php b/modules/Admin/Controllers/SoundbiteController.php
index e040404a..ca96f56b 100644
--- a/modules/Admin/Controllers/SoundbiteController.php
+++ b/modules/Admin/Controllers/SoundbiteController.php
@@ -43,7 +43,7 @@ class SoundbiteController extends BaseController
                         'id'         => $params[1],
                         'podcast_id' => $params[0],
                     ])
-                    ->first())
+                    ->first()) instanceof Episode
             ) {
                 throw PageNotFoundException::forPageNotFound();
             }
diff --git a/modules/Admin/Controllers/VideoClipsController.php b/modules/Admin/Controllers/VideoClipsController.php
index 0d5ff0dc..ddece561 100644
--- a/modules/Admin/Controllers/VideoClipsController.php
+++ b/modules/Admin/Controllers/VideoClipsController.php
@@ -46,7 +46,7 @@ class VideoClipsController extends BaseController
                         'id'         => $params[1],
                         'podcast_id' => $params[0],
                     ])
-                    ->first())
+                    ->first()) instanceof Episode
             ) {
                 throw PageNotFoundException::forPageNotFound();
             }
diff --git a/modules/Auth/Controllers/UserController.php b/modules/Auth/Controllers/UserController.php
index 9da5d0ed..31b7ea99 100644
--- a/modules/Auth/Controllers/UserController.php
+++ b/modules/Auth/Controllers/UserController.php
@@ -30,7 +30,7 @@ class UserController extends BaseController
             return $this->{$method}();
         }
 
-        if ($this->user = (new UserModel())->find($params[0])) {
+        if (($this->user = (new UserModel())->find($params[0])) instanceof User) {
             return $this->{$method}();
         }
 
diff --git a/modules/Fediverse/Controllers/ActorController.php b/modules/Fediverse/Controllers/ActorController.php
index 813b8f52..dd13c638 100644
--- a/modules/Fediverse/Controllers/ActorController.php
+++ b/modules/Fediverse/Controllers/ActorController.php
@@ -235,7 +235,7 @@ class ActorController extends Controller
                                 ->first();
                         }
 
-                        if ($reblogPost !== null) {
+                        if ($reblogPost instanceof \App\Entities\Post) {
                             model('PostModel', false)
                                 ->undoReblog($reblogPost, false);
 
diff --git a/modules/Fediverse/Models/FavouriteModel.php b/modules/Fediverse/Models/FavouriteModel.php
index 72afc5a0..ed5af480 100644
--- a/modules/Fediverse/Models/FavouriteModel.php
+++ b/modules/Fediverse/Models/FavouriteModel.php
@@ -169,7 +169,7 @@ class FavouriteModel extends UuidModel
                 'post_id'  => service('uuid')
                     ->fromString($post->id)
                     ->getBytes(),
-            ])->first()
+            ])->first() instanceof Favourite
         ) {
             $this->removeFavourite($actor, $post);
         } else {
diff --git a/modules/Fediverse/Models/PostModel.php b/modules/Fediverse/Models/PostModel.php
index 65d5d703..b2eedd6d 100644
--- a/modules/Fediverse/Models/PostModel.php
+++ b/modules/Fediverse/Models/PostModel.php
@@ -580,7 +580,7 @@ class PostModel extends UuidModel
                 'reblog_of_id' => $this->uuid
                     ->fromString($post->id)
                     ->getBytes(),
-            ])->first())
+            ])->first()) instanceof Post
         ) {
             $this->reblog($actor, $post);
         } else {
diff --git a/modules/Install/Controllers/InstallController.php b/modules/Install/Controllers/InstallController.php
index cb71c817..edd7f465 100644
--- a/modules/Install/Controllers/InstallController.php
+++ b/modules/Install/Controllers/InstallController.php
@@ -121,7 +121,7 @@ class InstallController extends Controller
 
             // Check if instance owner has been created, meaning install was completed
             if ($db->tableExists('users') && (new UserModel())->where('is_owner', true)
-                ->first() !== null
+                ->first() instanceof User
             ) {
                 // if so, show a 404 page
                 throw PageNotFoundException::forPageNotFound();
diff --git a/phpstan.neon b/phpstan.neon
index 183ded38..58b86925 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -40,10 +40,5 @@ parameters:
             - Michalsn\Uuid\Config\Services
             - Modules\PremiumPodcasts\Config\Services
             - Modules\Media\Config\Services
-    dynamicConstantNames:
-        - APP_NAMESPACE
-        - CI_DEBUG
-        - ENVIRONMENT
-        - SODIUM_LIBRARY_VERSION
     ignoreErrors:
         - '#^Call to an undefined method CodeIgniter\\Cache\\CacheInterface\:\:deleteMatching\(\)#'
diff --git a/rector.php b/rector.php
index ef860a13..c4ada50e 100644
--- a/rector.php
+++ b/rector.php
@@ -2,7 +2,6 @@
 
 declare(strict_types=1);
 
-use Rector\CodingStyle\Rector\ClassMethod\UnSpreadOperatorRector;
 use Rector\CodingStyle\Rector\Encapsed\EncapsedStringsToSprintfRector;
 use Rector\CodingStyle\Rector\Stmt\NewlineAfterStatementRector;
 use Rector\CodingStyle\Rector\String_\SymplifyQuoteEscapeRector;
@@ -49,7 +48,6 @@ return static function (RectorConfig $rectorConfig): void {
         // skip rules from used sets
         ChangeOrIfContinueToMultiContinueRector::class,
         EncapsedStringsToSprintfRector::class,
-        UnSpreadOperatorRector::class,
         RemoveExtraParametersRector::class,
         UnwrapFutureCompatibleIfPhpVersionRector::class,