diff --git a/lib/Doctrine/Common/Cli/CliController.php b/lib/Doctrine/Common/Cli/CliController.php
index ad90fb8e5..848bd0429 100644
--- a/lib/Doctrine/Common/Cli/CliController.php
+++ b/lib/Doctrine/Common/Cli/CliController.php
@@ -68,11 +68,11 @@ class CliController extends AbstractNamespace
         $this->setConfiguration($config);
         
         // Include core namespaces of tasks
-        $ns = '\Doctrine\Common\Cli\Tasks';
+        $ns = 'Doctrine\Common\Cli\Tasks';
         $this->addNamespace('Core')
              ->addTask('help', $ns . '\HelpTask');
         
-        $ns = '\Doctrine\ORM\Tools\Cli\Tasks';
+        $ns = 'Doctrine\ORM\Tools\Cli\Tasks';
         $this->addNamespace('Orm')
              ->addTask('clear-cache', $ns . '\ClearCacheTask')
              ->addTask('convert-mapping', $ns . '\ConvertMappingTask')
@@ -82,7 +82,7 @@ class CliController extends AbstractNamespace
              ->addTask('schema-tool', $ns . '\SchemaToolTask')
              ->addTask('version', $ns . '\VersionTask');
         
-        $ns = '\Doctrine\DBAL\Tools\Cli\Tasks';
+        $ns = 'Doctrine\DBAL\Tools\Cli\Tasks';
         $this->addNamespace('Dbal')
              ->addTask('run-sql', $ns . '\RunSqlTask');
     }
diff --git a/lib/Doctrine/ORM/Persisters/StandardEntityPersister.php b/lib/Doctrine/ORM/Persisters/StandardEntityPersister.php
index fa88139f3..cd52f0cbf 100644
--- a/lib/Doctrine/ORM/Persisters/StandardEntityPersister.php
+++ b/lib/Doctrine/ORM/Persisters/StandardEntityPersister.php
@@ -103,9 +103,8 @@ class StandardEntityPersister
     private $_insertSql;
 
     /**
-     * Initializes a new instance of a class derived from AbstractEntityPersister
-     * that uses the given EntityManager and persists instances of the class described
-     * by the given class metadata descriptor.
+     * Initializes a new <tt>StandardEntityPersister</tt> that uses the given EntityManager
+     * and persists instances of the class described by the given class metadata descriptor.
      * 
      * @param EntityManager $em
      * @param ClassMetadata $class
diff --git a/tools/sandbox/doctrine.php b/tools/sandbox/doctrine.php
index 93a592958..536a78554 100644
--- a/tools/sandbox/doctrine.php
+++ b/tools/sandbox/doctrine.php
@@ -1,13 +1,12 @@
 <?php
 
-require_once __DIR__ . '/../../lib/Doctrine/Common/ClassLoader.php';
+require __DIR__ . '/../../lib/Doctrine/Common/ClassLoader.php';
 
-$classLoader = new \Doctrine\Common\ClassLoader();
-$classLoader->setIncludePath(__DIR__ . '/../../lib');
+$classLoader = new \Doctrine\Common\ClassLoader('Doctrine', __DIR__ . '/../../lib');
 $classLoader->register();
 
 // Variable $configuration is defined inside cli-config.php
-require_once __DIR__ . '/cli-config.php';
+require __DIR__ . '/cli-config.php';
 
 $cli = new \Doctrine\Common\Cli\CliController($configuration);
 $cli->run($_SERVER['argv']);
\ No newline at end of file