diff --git a/core/ManifestBuilder.php b/core/ManifestBuilder.php
index 708543a66..5f91bdd3e 100644
--- a/core/ManifestBuilder.php
+++ b/core/ManifestBuilder.php
@@ -202,7 +202,7 @@ class ManifestBuilder {
 							This might mean that the wrong code is being used.", E_USER_WARNING);
 					} else {
 						user_error("Warning: there are two '$itemCode' files with the same filename: '$folder/$item' and '{$classMap[$itemCode]}'.  
-							This might mean that the wrong code is being used.", E_USER_WARNING);
+							This might mean that the wrong code is being used.", E_USER_NOTICE);
 					}
 				} else {
 					$classMap[$itemCode] = "$folder/$item";
diff --git a/core/model/DataObject.php b/core/model/DataObject.php
index 7dee39c76..576c4dff5 100644
--- a/core/model/DataObject.php
+++ b/core/model/DataObject.php
@@ -642,7 +642,6 @@ class DataObject extends Controller {
 	 */
 	public function getComponents($componentName, $filter = "", $sort = "", $join = "", $limit = "", $having = "") {
     	// TODO Does not take different SQL-parameters into account on subsequent calls
-    	if(isset($this->componentCache[$componentName])) {
     	if(isset($this->componentCache[$componentName]) && false != $this->componentCache[$componentName]) {
 	    	return $this->componentCache[$componentName];
     	}
@@ -701,7 +700,6 @@ class DataObject extends Controller {
 		// (mostly the classname of the calling DataObject)
 		foreach($allClasses as $class) {
 			// if this class does a "has-one"-representation, use it
-			if(isset($reversedComponentRelations[$class])) {
 			if(isset($reversedComponentRelations[$class]) && false != $reversedComponentRelations[$class]) {
 				$joinField = $reversedComponentRelations[$class] . 'ID';
 				break;
diff --git a/security/Auth/Yadis/Auth_Yadis_XMLParser.php b/security/Auth/Yadis/XML.php
similarity index 100%
rename from security/Auth/Yadis/Auth_Yadis_XMLParser.php
rename to security/Auth/Yadis/XML.php
diff --git a/security/Auth/Yadis/XRDS.php b/security/Auth/Yadis/XRDS.php
index d579488b9..127bc961c 100644
--- a/security/Auth/Yadis/XRDS.php
+++ b/security/Auth/Yadis/XRDS.php
@@ -16,7 +16,7 @@
 /**
  * Require the XPath implementation.
  */
-require_once 'Auth/Yadis/Auth_Yadis_XMLParser.php';
+require_once 'Auth/Yadis/XML.php';
 
 /**
  * This match mode means a given service must match ALL filters passed
@@ -445,4 +445,4 @@ class Auth_Yadis_XRDS {
     }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/security/Auth/_manifest_exclude b/security/Auth/_manifest_exclude
new file mode 100644
index 000000000..e69de29bb