diff --git a/cake/console/shells/tasks/extract.php b/cake/console/shells/tasks/extract.php
index c6e439313..03e1424e8 100644
--- a/cake/console/shells/tasks/extract.php
+++ b/cake/console/shells/tasks/extract.php
@@ -192,7 +192,10 @@ class ExtractTask extends Shell {
 		return $parser->description(__('CakePHP Language String Extraction:'))
 			->addOption('app', array('help' => __('directory where your application is located.')))
 			->addOption('paths', array('help' => __('comma separted list of paths, full paths are needed.')))
-			->addOption('merge', array('help' => __('[yes|no] Merge all domain strings into the default.po file.')))
+			->addOption('merge', array(
+				'help' => __('[yes|no] Merge all domain strings into the default.po file.'),
+				'choices' => array('yes', 'no')
+			))
 			->addOption('output', array('help' => __('Full path to output directory.')))
 			->addOption('files', array('help' => __('comma separated list of files, full paths are needed.')));
 	}
diff --git a/cake/console/shells/tasks/fixture.php b/cake/console/shells/tasks/fixture.php
index d24d5db85..5eccca367 100644
--- a/cake/console/shells/tasks/fixture.php
+++ b/cake/console/shells/tasks/fixture.php
@@ -54,8 +54,8 @@ class FixtureTask extends BakeTask {
  * Override initialize
  *
  */
-	public function __construct(&$dispatch, $stdout = null, $stderr = null, $stdin = null) {
-		parent::__construct($dispatch, $stdout, $stderr, $stdin);
+	public function __construct($stdout = null, $stderr = null, $stdin = null) {
+		parent::__construct($stdout, $stderr, $stdin);
 		$this->path = APP_PATH . 'tests' . DS . 'fixtures' . DS;
 	}
 
diff --git a/cake/console/shells/tasks/template.php b/cake/console/shells/tasks/template.php
index df9faf15a..546a585e3 100644
--- a/cake/console/shells/tasks/template.php
+++ b/cake/console/shells/tasks/template.php
@@ -17,6 +17,8 @@
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
+App::import('Core', 'Folder');
+
 class TemplateTask extends Shell {
 
 /**
@@ -179,7 +181,7 @@ class TemplateTask extends Shell {
 		}
 		$index = $this->in(__('Which bake theme would you like to use?'), range(1, $i - 1), 1);
 		$themeNames = array_keys($this->templatePaths);
-		$this->Dispatch->params['theme'] = $themeNames[$index - 1];
+		$this->params['theme'] = $themeNames[$index - 1];
 		return $indexedPaths[$index];
 	}