diff --git a/lib/Cake/Console/Command/ApiShell.php b/lib/Cake/Console/Command/ApiShell.php
index 44e36368f..7a7b664e8 100644
--- a/lib/Cake/Console/Command/ApiShell.php
+++ b/lib/Cake/Console/Command/ApiShell.php
@@ -77,7 +77,7 @@ class ApiShell extends AppShell {
 		if ($count > 1) {
 			$file = Inflector::underscore($this->args[1]);
 			$class = Inflector::camelize($this->args[1]);
-		} elseif($count) {
+		} elseif ($count) {
 			$file = $type;
 			$class = Inflector::camelize($type);
 		}
diff --git a/lib/Cake/Model/Datasource/DboSource.php b/lib/Cake/Model/Datasource/DboSource.php
index 3c358f401..14dbbfc7b 100644
--- a/lib/Cake/Model/Datasource/DboSource.php
+++ b/lib/Cake/Model/Datasource/DboSource.php
@@ -1053,7 +1053,7 @@ class DboSource extends DataSource {
 
 		if ($model->recursive == -1) {
 			$_associations = array();
-		} elseif (!$model->recursive) {
+		} elseif (!$model->recursive === 0) {
 			unset($_associations[2], $_associations[3]);
 		}