diff --git a/src/Cache/ClientCache.php b/src/Cache/ClientCache.php
index bc91b97..e92a3d5 100644
--- a/src/Cache/ClientCache.php
+++ b/src/Cache/ClientCache.php
@@ -11,6 +11,11 @@ use Sabre\Event\Promise;
  */
 class ClientCache implements Cache
 {
+    /**
+     * @var LanguageClient
+     */
+    public $client;
+
     /**
      * @param LanguageClient $client
      */
diff --git a/src/Client/TextDocument.php b/src/Client/TextDocument.php
index f163d60..1e65995 100644
--- a/src/Client/TextDocument.php
+++ b/src/Client/TextDocument.php
@@ -4,7 +4,7 @@ declare(strict_types = 1);
 namespace LanguageServer\Client;
 
 use LanguageServer\ClientHandler;
-use LanguageServer\Protocol\{TextDocumentItem, TextDocumentIdentifier};
+use LanguageServer\Protocol\{Diagnostic, TextDocumentItem, TextDocumentIdentifier};
 use Sabre\Event\Promise;
 use JsonMapper;
 
diff --git a/src/Definition.php b/src/Definition.php
index 1600408..2c92eb9 100644
--- a/src/Definition.php
+++ b/src/Definition.php
@@ -4,7 +4,7 @@ declare(strict_types = 1);
 namespace LanguageServer;
 
 use LanguageServer\Index\ReadableIndex;
-use phpDocumentor\Reflection\{Types, Type, Fqsen, TypeResolver};
+use phpDocumentor\Reflection\{Types, Type, TypeResolver};
 use LanguageServer\Protocol\SymbolInformation;
 use Generator;
 
@@ -80,7 +80,7 @@ class Definition
      * Can also be a compound type.
      * If it is unknown, will be Types\Mixed_.
      *
-     * @var \phpDocumentor\Type|null
+     * @var Type|null
      */
     public $type;
 
diff --git a/src/PhpDocument.php b/src/PhpDocument.php
index 805bc08..373ba69 100644
--- a/src/PhpDocument.php
+++ b/src/PhpDocument.php
@@ -63,7 +63,7 @@ class PhpDocument
     /**
      * Map from fully qualified name (FQN) to Node
      *
-     * @var Node
+     * @var Node[]
      */
     private $definitionNodes;
 
diff --git a/src/SignatureHelpProvider.php b/src/SignatureHelpProvider.php
index 439be9c..92775be 100644
--- a/src/SignatureHelpProvider.php
+++ b/src/SignatureHelpProvider.php
@@ -6,8 +6,7 @@ namespace LanguageServer;
 use LanguageServer\Index\ReadableIndex;
 use LanguageServer\Protocol\{
     Position,
-    SignatureHelp,
-    ParameterInformation
+    SignatureHelp
 };
 use Microsoft\PhpParser\Node;
 use Sabre\Event\Promise;