diff --git a/docs/advanced.md b/docs/advanced.md
index da456c4fc..260a5898a 100644
--- a/docs/advanced.md
+++ b/docs/advanced.md
@@ -365,7 +365,7 @@ class ControllerUniqueFields
     }
     use \Atk4\Core\TrackableTrait;
 
-    protected $fields = null;
+    protected ?array $fields = null;
 
     protected function init(): void
     {
diff --git a/src/Model/Scope.php b/src/Model/Scope.php
index 6a31140b8..4b1ed1f54 100644
--- a/src/Model/Scope.php
+++ b/src/Model/Scope.php
@@ -64,7 +64,7 @@ public function __clone()
         if ($this->issetOwner()) {
             $this->unsetOwner();
         }
-        $this->shortName = null; // @phpstan-ignore-line
+        // $this->shortName = null; // uncomment once https://github.com/php/php-src/issues/9389 is resolved
     }
 
     /**