diff --git a/src/Controller.php b/src/Controller.php
index 962d2fed..8c352c9a 100644
--- a/src/Controller.php
+++ b/src/Controller.php
@@ -354,7 +354,6 @@ protected function getRequestQueryVariables(HTTPRequest $request): array
             $query = isset($data['query']) ? $data['query'] : null;
             $variables = isset($data['variables']) ? (array)$data['variables'] : null;
         } else {
-            /** @var RequestProcessor $persistedProcessor  */
             $persistedProcessor = Injector::inst()->get(RequestProcessor::class);
             list($query, $variables) = $persistedProcessor->getRequestQueryVariables($request);
         }
diff --git a/src/Extensions/ClientConfigProvider.php b/src/Extensions/ClientConfigProvider.php
index f9a6b061..417e6268 100644
--- a/src/Extensions/ClientConfigProvider.php
+++ b/src/Extensions/ClientConfigProvider.php
@@ -2,10 +2,14 @@
 
 namespace SilverStripe\GraphQL\Extensions;
 
+use SilverStripe\Admin\LeftAndMain;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Core\Extension;
 use SilverStripe\GraphQL\Controller;
 
+/**
+ * @extends Extension<LeftAndMain>
+ */
 class ClientConfigProvider extends Extension
 {
     public function updateClientConfig(array &$config): void
diff --git a/src/Extensions/DevBuildExtension.php b/src/Extensions/DevBuildExtension.php
index 64ce1579..40836ad2 100644
--- a/src/Extensions/DevBuildExtension.php
+++ b/src/Extensions/DevBuildExtension.php
@@ -8,8 +8,12 @@
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\GraphQL\Dev\Build;
 use SilverStripe\GraphQL\Schema\Logger;
+use SilverStripe\ORM\DatabaseAdmin;
 use SilverStripe\ORM\DataExtension;
 
+/**
+ * @extends DataExtension<DatabaseAdmin>
+ */
 class DevBuildExtension extends DataExtension
 {
     use Configurable;
diff --git a/src/Extensions/QueryRecorderExtension.php b/src/Extensions/QueryRecorderExtension.php
index 532aade7..d447476c 100644
--- a/src/Extensions/QueryRecorderExtension.php
+++ b/src/Extensions/QueryRecorderExtension.php
@@ -11,6 +11,8 @@
 /**
  * Attaches itself to {@see DataQuery} and records any classes that are queried within a closure context.
  * Allows code to measure and detect affected classes within any operation. E.g. for caching.
+ *
+ * @extends DataExtension<DataObject>
  */
 class QueryRecorderExtension extends DataExtension
 {
diff --git a/src/Extensions/TestSessionEnvironmentExtension.php b/src/Extensions/TestSessionEnvironmentExtension.php
index bad63a85..058a0e7e 100644
--- a/src/Extensions/TestSessionEnvironmentExtension.php
+++ b/src/Extensions/TestSessionEnvironmentExtension.php
@@ -8,7 +8,11 @@
 use SilverStripe\GraphQL\Schema\SchemaBuilder;
 use SilverStripe\GraphQL\Schema\Exception\EmptySchemaException;
 use SilverStripe\GraphQL\Dev\Benchmark;
+use SilverStripe\TestSession\TestSessionEnvironment;
 
+/**
+ * @extends Extension<TestSessionEnvironment>
+ */
 class TestSessionEnvironmentExtension extends Extension
 {
     /**
diff --git a/src/PersistedQuery/RequestIDProcessor.php b/src/PersistedQuery/RequestIDProcessor.php
index eabb6fe3..1478bb35 100644
--- a/src/PersistedQuery/RequestIDProcessor.php
+++ b/src/PersistedQuery/RequestIDProcessor.php
@@ -26,7 +26,6 @@ public function getRequestQueryVariables(HTTPRequest $request): array
             if ($query) {
                 throw new LogicException('Cannot pass a query when an ID has been specified.');
             }
-            /** @var PersistedQueryMappingProvider $provider */
             $provider = Injector::inst()->get(PersistedQueryMappingProvider::class);
 
             $query = $provider->getByID($id);
diff --git a/src/QueryHandler/QueryHandler.php b/src/QueryHandler/QueryHandler.php
index 046205f5..600fa6eb 100644
--- a/src/QueryHandler/QueryHandler.php
+++ b/src/QueryHandler/QueryHandler.php
@@ -170,7 +170,6 @@ public function validateQueryBeforeParsing(string $query, array $context): void
      */
     public function getQueryFromPersistedID(string $id): ?string
     {
-        /** @var PersistedQueryMappingProvider $provider */
         $provider = Injector::inst()->get(PersistedQueryMappingProvider::class);
 
         return $provider->getByID($id);
@@ -291,7 +290,6 @@ protected function callMiddleware(GraphQLSchema $schema, string $query, array $c
         $next = $last;
         // Filter out any middlewares that are set to `false`, e.g. via config
         $middlewares = array_reverse(array_filter($this->getMiddlewares() ?? []));
-        /** @var QueryMiddleware $middleware */
         foreach ($middlewares as $middleware) {
             $next = function ($schema, $query, $context, $params) use ($middleware, $next) {
                 return $middleware->process($schema, $query, $context, $params, $next);
diff --git a/src/Schema/DataObject/DeleteCreator.php b/src/Schema/DataObject/DeleteCreator.php
index c1cd71dd..582e0c8c 100644
--- a/src/Schema/DataObject/DeleteCreator.php
+++ b/src/Schema/DataObject/DeleteCreator.php
@@ -82,7 +82,6 @@ public static function resolve(array $resolverContext = []): Closure
                 }
 
                 // Before deleting, check if any items fail canDelete()
-                /** @var DataObject[] $resultsList */
                 $resultsList = $results->toArray();
                 foreach ($resultsList as $obj) {
                     $member = UserContextProvider::get($context);