diff --git a/src/AbstractCsv.php b/src/AbstractCsv.php
index 157832ec..d660fb32 100644
--- a/src/AbstractCsv.php
+++ b/src/AbstractCsv.php
@@ -73,8 +73,8 @@ abstract class AbstractCsv implements JsonSerializable, IteratorAggregate
      * an object that implements the `__toString` method
      * a path to a file
      *
-     * @param \SplFileInfo|object|string $path      The file path
-     * @param string                     $open_mode the file open mode flag
+     * @param object|string $path      The file path
+     * @param string        $open_mode the file open mode flag
      */
     public function __construct($path, $open_mode = 'r+')
     {
@@ -127,14 +127,14 @@ public function __destruct()
      *
      * BUT NOT a SplTempFileObject
      *
-     * ```php
+     * <code>
      *<?php
      * $csv = new Reader::createFromPath('/path/to/file.csv', 'a+');
      * $csv = new Reader::createFromPath(new SplFileInfo('/path/to/file.csv'));
      * $csv = new Reader::createFromPath(new SplFileObject('/path/to/file.csv'), 'rb');
      *
      * ?>
-     * ```
+     * </code>
      *
      * @param object|string $path      file path
      * @param string        $open_mode the file open mode flag
@@ -164,13 +164,13 @@ public static function createFromPath($path, $open_mode = 'r+')
      * - a SplFileObject,
      * - a SplTempFileObject
      *
-     * ```php
+     * <code>
      *<?php
      * $csv = new Writer::createFromFileObject(new SplFileInfo('/path/to/file.csv'));
      * $csv = new Writer::createFromFileObject(new SplTempFileObject);
      *
      * ?>
-     * ```
+     * </code>
      *
      * @param SplFileObject $obj
      *
@@ -281,7 +281,7 @@ public function jsonSerialize()
      *
      * @param string $str
      *
-     * @return $this
+     * @return static
      */
     public function setEncodingFrom($str)
     {
diff --git a/src/Config/StreamFilter.php b/src/Config/StreamFilter.php
index c8a32d58..7e02fcc1 100644
--- a/src/Config/StreamFilter.php
+++ b/src/Config/StreamFilter.php
@@ -134,7 +134,7 @@ public function isActiveStreamFilter()
      *
      * @param integer $mode
      *
-     * @return static
+     * @return $this
      *
      * @throws \OutOfBoundsException If the mode is invalid
      */
@@ -168,7 +168,7 @@ public function getStreamFilterMode()
      *
      * @param string $filter_name a string or an object that implements the '__toString' method
      *
-     * @return static
+     * @return $this
      */
     public function appendStreamFilter($filter_name)
     {
@@ -183,7 +183,7 @@ public function appendStreamFilter($filter_name)
      *
      * @param string $filter_name a string or an object that implements the '__toString' method
      *
-     * @return static
+     * @return $this
      */
     public function prependStreamFilter($filter_name)
     {
@@ -227,7 +227,7 @@ public function hasStreamFilter($filter_name)
      *
      * @param string $filter_name
      *
-     * @return static
+     * @return $this
      */
     public function removeStreamFilter($filter_name)
     {
@@ -243,7 +243,7 @@ public function removeStreamFilter($filter_name)
     /**
      * Remove all registered stream filter
      *
-     * @return static
+     * @return $this
      */
     public function clearStreamFilter()
     {