diff --git a/cake/console/cake.php b/cake/console/cake.php
index 936053558..2ca2343ef 100644
--- a/cake/console/cake.php
+++ b/cake/console/cake.php
@@ -234,6 +234,7 @@ class ShellDispatcher {
 
 		if (!file_exists(APP_PATH . 'config' . DS . 'core.php')) {
 			include_once CORE_PATH . 'cake' . DS . 'console' . DS . 'libs' . DS . 'templates' . DS . 'skel' . DS . 'config' . DS . 'core.php';
+			Configure::buildPaths(array());
 		}
 
 		Configure::write('debug', 1);
diff --git a/cake/libs/controller/components/email.php b/cake/libs/controller/components/email.php
index 3cbbaa881..745a91df1 100644
--- a/cake/libs/controller/components/email.php
+++ b/cake/libs/controller/components/email.php
@@ -437,7 +437,6 @@ class EmailComponent extends Object{
  * @access private
  */
 	function __createHeader() {
-		//$this->__header = '';
 		if ($this->delivery == 'smtp') {
 			$this->__header = 'To: ' . $this->__formatAddress($this->to) . $this->_newLine;
 		}