diff --git a/src/Storage/Adapter/AdapterOptions.php b/src/Storage/Adapter/AdapterOptions.php
index b3669ffa4..7e4950626 100644
--- a/src/Storage/Adapter/AdapterOptions.php
+++ b/src/Storage/Adapter/AdapterOptions.php
@@ -25,7 +25,7 @@ class AdapterOptions extends AbstractOptions
     /**
      * The adapter using these options
      *
-     * @var null|Filesystem
+     * @var null|StorageInterface
      */
     protected $adapter;
 
diff --git a/src/Storage/Adapter/DbaIterator.php b/src/Storage/Adapter/DbaIterator.php
index a895ce545..a0a553aed 100644
--- a/src/Storage/Adapter/DbaIterator.php
+++ b/src/Storage/Adapter/DbaIterator.php
@@ -17,7 +17,7 @@ class DbaIterator implements IteratorInterface
     /**
      * The apc storage instance
      *
-     * @var Apc
+     * @var Dba
      */
     protected $storage;
 
diff --git a/src/Storage/Adapter/XCache.php b/src/Storage/Adapter/XCache.php
index 18073e9fe..d5021de5f 100644
--- a/src/Storage/Adapter/XCache.php
+++ b/src/Storage/Adapter/XCache.php
@@ -45,7 +45,7 @@ class XCache extends AbstractAdapter implements
     /**
      * Constructor
      *
-     * @param  null|array|Traversable|ApcOptions $options
+     * @param  null|array|Traversable|XCacheOptions $options
      * @throws Exception\ExceptionInterface
      */
     public function __construct($options = null)
@@ -74,7 +74,7 @@ public function __construct($options = null)
     /**
      * Set options.
      *
-     * @param  array|Traversable|ApcOptions $options
+     * @param  array|Traversable|XCacheOptions $options
      * @return XCache
      * @see    getOptions()
      */
diff --git a/src/Storage/Plugin/IgnoreUserAbort.php b/src/Storage/Plugin/IgnoreUserAbort.php
index ddec6354c..6c4450a0d 100644
--- a/src/Storage/Plugin/IgnoreUserAbort.php
+++ b/src/Storage/Plugin/IgnoreUserAbort.php
@@ -85,7 +85,7 @@ public function attach(EventManagerInterface $events, $priority = 1)
     public function onBefore(Event $event)
     {
         if ($this->activatedTarget === null && !ignore_user_abort(true)) {
-            $this->activatedTarget = $event->getTarget();
+            $this->activatedTarget = $event->getStorage();
         }
     }
 
@@ -101,7 +101,7 @@ public function onBefore(Event $event)
      */
     public function onAfter(Event $event)
     {
-        if ($this->activatedTarget === $event->getTarget()) {
+        if ($this->activatedTarget === $event->getStorage()) {
             // exit if connection aborted
             if ($this->getOptions()->getExitOnAbort() && connection_aborted()) {
                 exit;