diff --git a/classes/DQL/Parser.class.php b/classes/DQL/Parser.class.php
index 163b16715..9887b0760 100644
--- a/classes/DQL/Parser.class.php
+++ b/classes/DQL/Parser.class.php
@@ -600,7 +600,7 @@ class Doctrine_DQL_Parser {
                 foreach($parts as $part) {
                     $ret[] = $this->parseWhere($part);
                 }
-                $r = implode(" || ",$ret);
+                $r = implode(" OR ",$ret);
             } else {
                 return $this->loadWhere($parts[0]);
             }
diff --git a/classes/Record.class.php b/classes/Record.class.php
index e943976cf..5794d4afd 100644
--- a/classes/Record.class.php
+++ b/classes/Record.class.php
@@ -725,7 +725,7 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
      *
      * @return boolean      true on success, false on failure
      */
-    final public function delete() {
+    public function delete() {
         $this->table->getSession()->delete($this);
     }
     /**
diff --git a/tests/DQLParserTestCase.class.php b/tests/DQLParserTestCase.class.php
index b0143af47..31444d426 100644
--- a/tests/DQLParserTestCase.class.php
+++ b/tests/DQLParserTestCase.class.php
@@ -88,6 +88,7 @@ class Doctrine_DQL_ParserTestCase extends Doctrine_UnitTestCase {
 
 
         // DYNAMIC FETCHMODES
+        $e = false;
         try {
             $users = $graph->query("FROM User-unknown");
         } catch(Exception $e) {