diff --git a/src/PhpWord/Settings.php b/src/PhpWord/Settings.php
index 3c73c3ac..17bc3429 100644
--- a/src/PhpWord/Settings.php
+++ b/src/PhpWord/Settings.php
@@ -132,7 +132,7 @@ class Settings
      * This sets the setIndent and setIndentString for better compatibility
      *
      * @param bool $compatibility
-     * @return true
+     * @return bool
      */
     public static function setCompatibility($compatibility)
     {
diff --git a/src/PhpWord/Style/Table.php b/src/PhpWord/Style/Table.php
index 90e8282f..68b53463 100644
--- a/src/PhpWord/Style/Table.php
+++ b/src/PhpWord/Style/Table.php
@@ -430,7 +430,7 @@ class Table extends Border
     /**
      * Get cell margin
      *
-     * @return int[]
+     * @return integer[]
      */
     public function getCellMargin()
     {
diff --git a/tests/PhpWord/Tests/SettingsTest.php b/tests/PhpWord/Tests/SettingsTest.php
index aa9ef945..d188595e 100644
--- a/tests/PhpWord/Tests/SettingsTest.php
+++ b/tests/PhpWord/Tests/SettingsTest.php
@@ -103,6 +103,6 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
             'defaultFontName' => 'Arial',
             'defaultFontSize' => 10,
         );
-        $this->assertEquals($expected, Settings::loadConfig(__DIR__ . '/../../../phpword.yml.dist'));
+        $this->assertEquals($expected, Settings::loadConfig(__DIR__ . '/../../../phpword.ini.dist'));
     }
 }