diff --git a/src/Controllers/ShareDraftController.php b/src/Controllers/ShareDraftController.php
index 4616d0c..2753417 100644
--- a/src/Controllers/ShareDraftController.php
+++ b/src/Controllers/ShareDraftController.php
@@ -81,7 +81,6 @@ public function preview(HTTPRequest $request)
                 ->setSession(Injector::inst()->create(Session::class, []))
                 ->getSession();
         }
-        /** @var ShareToken $shareToken */
         $shareToken = ShareToken::get()->filter('Token', $token)->first();
 
         if (!$shareToken) {
diff --git a/src/Extensions/ShareDraftContentControllerExtension.php b/src/Extensions/ShareDraftContentControllerExtension.php
index 03b586c..c205f37 100644
--- a/src/Extensions/ShareDraftContentControllerExtension.php
+++ b/src/Extensions/ShareDraftContentControllerExtension.php
@@ -2,9 +2,13 @@
 
 namespace SilverStripe\ShareDraftContent\Extensions;
 
+use SilverStripe\Control\Controller;
 use SilverStripe\Core\Extension;
 use SilverStripe\Security\Security;
 
+/**
+ * @extends Extension<Controller>
+ */
 class ShareDraftContentControllerExtension extends Extension
 {
     /**
diff --git a/src/Extensions/ShareDraftContentFileShortcodeProviderExtension.php b/src/Extensions/ShareDraftContentFileShortcodeProviderExtension.php
index 3651302..e5ca4e1 100644
--- a/src/Extensions/ShareDraftContentFileShortcodeProviderExtension.php
+++ b/src/Extensions/ShareDraftContentFileShortcodeProviderExtension.php
@@ -8,6 +8,9 @@
 use SilverStripe\Core\Extension;
 use SilverStripe\ShareDraftContent\Controllers\ShareDraftController;
 
+/**
+ * @extends Extension<FileShortcodeProvider>
+ */
 class ShareDraftContentFileShortcodeProviderExtension extends Extension
 {
     /**
diff --git a/src/Extensions/ShareDraftContentRequirementsExtension.php b/src/Extensions/ShareDraftContentRequirementsExtension.php
index da5a9ba..a90a510 100644
--- a/src/Extensions/ShareDraftContentRequirementsExtension.php
+++ b/src/Extensions/ShareDraftContentRequirementsExtension.php
@@ -2,9 +2,13 @@
 
 namespace SilverStripe\ShareDraftContent\Extensions;
 
+use SilverStripe\CMS\Controllers\CMSMain;
 use SilverStripe\ORM\DataExtension;
 use SilverStripe\View\Requirements;
 
+/**
+ * @extends DataExtension<CMSMain>
+ */
 class ShareDraftContentRequirementsExtension extends DataExtension
 {
     public function init()
diff --git a/src/Extensions/ShareDraftContentSiteTreeExtension.php b/src/Extensions/ShareDraftContentSiteTreeExtension.php
index edfb30c..0bcb7ff 100644
--- a/src/Extensions/ShareDraftContentSiteTreeExtension.php
+++ b/src/Extensions/ShareDraftContentSiteTreeExtension.php
@@ -13,9 +13,10 @@
 use SilverStripe\Subsites\Model\Subsite;
 
 /**
- * @property SiteTree|ShareDraftContentSiteTreeExtension $owner
  * @property string $ShareTokenSalt
  * @method HasManyList<ShareToken> ShareTokens()
+ *
+ * @extends DataExtension<SiteTree&static>
  */
 class ShareDraftContentSiteTreeExtension extends DataExtension
 {