diff --git a/lib/Doctrine.php b/lib/Doctrine.php
index 97b5dcd33..caffe1398 100644
--- a/lib/Doctrine.php
+++ b/lib/Doctrine.php
@@ -1010,7 +1010,7 @@ final class Doctrine
     /**
      * classifyCallback
      *
-     * Callback function to classify a classname propperly. 
+     * Callback function to classify a classname properly. 
      *
      * @param array $matches An array of matches from a pcre_replace call
      * @return string A string with matches 1 and mathces 3 in upper case. 
@@ -1047,8 +1047,7 @@ final class Doctrine
      */
     public static function makeDirectories($path, $mode = 0777)
     {
-        if (is_dir($path) || is_file($path))
-        {
+        if (is_dir($path) || is_file($path)) {
           return true;
         }
 
diff --git a/lib/Doctrine/Template/I18n.php b/lib/Doctrine/Template/I18n.php
index 07745da5d..0ca05519f 100644
--- a/lib/Doctrine/Template/I18n.php
+++ b/lib/Doctrine/Template/I18n.php
@@ -79,7 +79,7 @@ class Doctrine_Template_I18n extends Doctrine_Template
         
         $id = $this->_table->getIdentifier();
 
-        $this->hasMany($className . ' as Translation', array('local' => $id, 'foreign' => $id));
+        $this->hasMany($className . ' as Translation', array('local' => $id[0], 'foreign' => $id[0]));
     }
     
     /**