diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index baf52d30d1a..74fd21da47f 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -42,6 +42,8 @@ class modAdherent extends DolibarrModules
      */
     function __construct($db)
     {
+    	global $conf;
+    	
         $this->db = $db;
         $this->numero = 310;
 
@@ -177,7 +179,7 @@ class modAdherent extends DolibarrModules
         $this->export_TypeFields_array[$r]=array('a.civilite'=>"Text",'a.lastname'=>"Text",'a.firstname'=>"Text",'a.login'=>"Text",'a.morphy'=>'Text','a.societe'=>'Text','a.address'=>"Text",'a.zip'=>"Text",'a.town'=>"Text",'a.country'=>"Text",'a.phone'=>"Text",'a.phone_perso'=>"Text",'a.phone_mobile'=>"Text",'a.email'=>"Text",'a.birth'=>"Date",'a.statut'=>"Status",'a.note'=>"Text",'a.datec'=>'Date','a.datevalid'=>'Date','a.tms'=>'Date','a.datefin'=>'Date','ta.rowid'=>'List:fk_adherent_type:libelle','ta.libelle'=>'Text','c.dateadh'=>'Date','c.cotisation'=>'Number');
         $this->export_entities_array[$r]=array('a.rowid'=>'member','a.civilite'=>"member",'a.lastname'=>"member",'a.firstname'=>"member",'a.login'=>"member",'a.morphy'=>'member','a.societe'=>'member','a.address'=>"member",'a.zip'=>"member",'a.town'=>"member",'a.country'=>"member",'a.phone'=>"member",'a.phone_perso'=>"member",'a.phone_mobile'=>"member",'a.email'=>"member",'a.birth'=>"member",'a.statut'=>"member",'a.photo'=>"member",'a.note'=>"member",'a.datec'=>'member','a.datevalid'=>'member','a.tms'=>'member','a.datefin'=>'member','ta.rowid'=>'member_type','ta.libelle'=>'member_type','c.rowid'=>'subscription','c.dateadh'=>'subscription','c.cotisation'=>'subscription');
 		// Add extra fields
-		$sql="SELECT name, label FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'member'";
+		$sql="SELECT name, label FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'member' AND entity = ".$conf->entity;
 		$resql=$this->db->query($sql);
 		while ($obj=$this->db->fetch_object($resql))
 		{
diff --git a/htdocs/core/modules/modExternalRss.class.php b/htdocs/core/modules/modExternalRss.class.php
index fc94dd8c405..5e7de7abea5 100644
--- a/htdocs/core/modules/modExternalRss.class.php
+++ b/htdocs/core/modules/modExternalRss.class.php
@@ -105,9 +105,9 @@ class modExternalRss extends DolibarrModules
 				if (preg_match('/EXTERNAL_RSS_TITLE_([0-9]+)/i',$obj->name,$reg))
 				{
 					// Definie la boite si on a trouvee une ancienne configuration
-					$this->boxes[$reg[1]][0] = "(ExternalRSSInformations)";
-					$this->boxes[$reg[1]][1] = "box_external_rss.php";
-					$this->boxes[$reg[1]][2] = $reg[1]." (".$obj->value.")";
+					//$this->boxes[$reg[1]][0] = "(ExternalRSSInformations)";
+					$this->boxes[$reg[1]]['file'] = "box_external_rss.php";
+					$this->boxes[$reg[1]]['note'] = $reg[1]." (".$obj->value.")";
 				}
 			}
 			$this->db->free($result);
@@ -131,7 +131,7 @@ class modExternalRss extends DolibarrModules
 		$sql = array();
 
 		// Delete old declarations of RSS box
-		$this->boxes[0][1] = "box_external_rss.php";
+		$this->boxes[0]['file'] = "box_external_rss.php";
 
 		return $this->_remove($sql,$options);
     }