diff --git a/app/Mage.php b/app/Mage.php
index d165e70f4cd..bc55f3ae05b 100644
--- a/app/Mage.php
+++ b/app/Mage.php
@@ -577,7 +577,7 @@ public static function getControllerInstance($class, $request, $response, array
     }
 
     /**
-     * Retrieve resource vodel object singleton
+     * Retrieve resource model object singleton
      *
      * @param   string $modelClass
      * @return  object
diff --git a/app/code/core/Mage/Catalog/Model/Category.php b/app/code/core/Mage/Catalog/Model/Category.php
index 480bcda0841..79af38147b3 100644
--- a/app/code/core/Mage/Catalog/Model/Category.php
+++ b/app/code/core/Mage/Catalog/Model/Category.php
@@ -45,10 +45,10 @@
  * @method $this setIncludeInMenu(int $value)
  * @method bool getInitialSetupFlag()
  * @method $this setInitialSetupFlag(bool $value)
- * @method bool getIsActive()
- * @method $this setIsActive(bool $value)
- * @method bool getIsAnchor()
- * @method $this setIsAnchor(bool $value)
+ * @method int getIsActive()
+ * @method $this setIsActive(int $value)
+ * @method int getIsAnchor()
+ * @method $this setIsAnchor(int $value)
  * @method $this setIsChangedProductList(bool $bool)
  *
  * @method int getLandingPage()
diff --git a/app/code/core/Mage/Core/Model/Abstract.php b/app/code/core/Mage/Core/Model/Abstract.php
index 26e6214bbf1..208eb1aa091 100644
--- a/app/code/core/Mage/Core/Model/Abstract.php
+++ b/app/code/core/Mage/Core/Model/Abstract.php
@@ -441,7 +441,7 @@ protected function _beforeSave()
      * Get list of cache tags applied to model object.
      * Return false if cache tags are not supported by model
      *
-     * @return array | false
+     * @return array|false
      */
     public function getCacheTags()
     {
@@ -467,7 +467,7 @@ public function getCacheTags()
     /**
      * Get cache tags associated with object id
      *
-     * @return array|bool
+     * @return array|false
      */
     public function getCacheIdTags()
     {
diff --git a/app/code/core/Mage/Core/Model/Resource/Resource.php b/app/code/core/Mage/Core/Model/Resource/Resource.php
index 81b8ea5ac0a..8e1042d96c9 100644
--- a/app/code/core/Mage/Core/Model/Resource/Resource.php
+++ b/app/code/core/Mage/Core/Model/Resource/Resource.php
@@ -84,7 +84,7 @@ protected function _loadVersionData($needType)
      * Get Module version from DB
      *
      * @param string $resName
-     * @return bool|string
+     * @return string|false
      * @SuppressWarnings(PHPMD.CamelCaseVariableName)
      */
     public function getDbVersion($resName)
diff --git a/app/code/core/Mage/Directory/Model/Resource/Country/Collection.php b/app/code/core/Mage/Directory/Model/Resource/Country/Collection.php
index c27a4b2bef8..d1af350080c 100644
--- a/app/code/core/Mage/Directory/Model/Resource/Country/Collection.php
+++ b/app/code/core/Mage/Directory/Model/Resource/Country/Collection.php
@@ -21,6 +21,8 @@
  * @package    Mage_Directory
  *
  * @property Mage_Directory_Model_Country[] $_items
+ * @method  Mage_Directory_Model_Country getFirstItem()
+ * @method  Mage_Directory_Model_Country getLastItem()
  */
 class Mage_Directory_Model_Resource_Country_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute.php b/app/code/core/Mage/Eav/Model/Entity/Attribute.php
index 33d7512c409..8e2d97718eb 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute.php
@@ -22,6 +22,7 @@
  *
  * @method Mage_Eav_Model_Resource_Entity_Attribute _getResource()
  * @method Mage_Eav_Model_Resource_Entity_Attribute getResource()
+ * @method Mage_Eav_Model_Resource_Entity_Attribute_Collection getCollection()
  * @method Mage_Eav_Model_Resource_Entity_Attribute_Collection getResourceCollection()
  *
  * @method int getAttributeGroupId()
diff --git a/app/code/core/Mage/Rss/Block/Catalog/Category.php b/app/code/core/Mage/Rss/Block/Catalog/Category.php
index f724c4bf49c..ec5a5f8f9b8 100644
--- a/app/code/core/Mage/Rss/Block/Catalog/Category.php
+++ b/app/code/core/Mage/Rss/Block/Catalog/Category.php
@@ -55,7 +55,7 @@ protected function _toHtml()
             if ($category->getId()) {
                 $layer = Mage::getSingleton('catalog/layer')->setStore($storeId);
                 //want to load all products no matter anchor or not
-                $category->setIsAnchor(true);
+                $category->setIsAnchor(1);
                 $newurl = $category->getUrl();
                 $title = $category->getName();
                 $data = ['title' => $title,