diff --git a/src/AuthorizationServer.php b/src/AuthorizationServer.php
index 8180f3ba1..64f464387 100644
--- a/src/AuthorizationServer.php
+++ b/src/AuthorizationServer.php
@@ -71,7 +71,7 @@ class AuthorizationServer implements EmitterAwareInterface
     private $scopeRepository;
 
     /**
-     * @var ClaimRepositoryInterface
+     * @var null|ClaimRepositoryInterface
      */
     private $claimRepository;
 
diff --git a/src/Grant/AbstractGrant.php b/src/Grant/AbstractGrant.php
index 1e690a791..e0424498e 100644
--- a/src/Grant/AbstractGrant.php
+++ b/src/Grant/AbstractGrant.php
@@ -65,7 +65,7 @@ abstract class AbstractGrant implements GrantTypeInterface
     protected $scopeRepository;
 
     /**
-     * @var ClaimRepositoryInterface
+     * @var null|ClaimRepositoryInterface
      */
     protected $claimRepository;
 
diff --git a/src/Repositories/AccessTokenRepositoryInterface.php b/src/Repositories/AccessTokenRepositoryInterface.php
index f414d9ca0..43daaa00d 100644
--- a/src/Repositories/AccessTokenRepositoryInterface.php
+++ b/src/Repositories/AccessTokenRepositoryInterface.php
@@ -25,8 +25,8 @@ interface AccessTokenRepositoryInterface extends RepositoryInterface
      *
      * @param ClientEntityInterface  $clientEntity
      * @param ScopeEntityInterface[] $scopes
-     * @param array                  $claims
-     * @param ClaimEntityInterface[] $userIdentifier
+     * @param string|null            $userIdentifier
+     * @param ClaimEntityInterface[] $claims
      *
      * @return AccessTokenEntityInterface
      */