diff --git a/etemplate/inc/class.editor.inc.php b/etemplate/inc/class.editor.inc.php
index 173a0f0898..c8136f18a5 100644
--- a/etemplate/inc/class.editor.inc.php
+++ b/etemplate/inc/class.editor.inc.php
@@ -524,7 +524,7 @@
 			{
 				$this->etemplate->xul_io = CreateObject('etemplate.xul_io');
 			}
-			$xul = $this->etemplate->xul_io->export(&$this->etemplate);
+			$xul = $this->etemplate->xul_io->export($this->etemplate);
 
 			fwrite($f,$xul);
 			fclose($f);
@@ -545,7 +545,7 @@
 			{
 				$this->etemplate->xul_io = CreateObject('etemplate.xul_io');
 			}
-			$imported = $this->etemplate->xul_io->import(&$this->etemplate,$xul);
+			$imported = $this->etemplate->xul_io->import($this->etemplate,$xul);
 			$this->etemplate->modified = @filemtime($f);
 			$this->etemplate->modified_set = 'xul-import';
 
diff --git a/etemplate/inc/class.link_widget.inc.php b/etemplate/inc/class.link_widget.inc.php
index 86005ead3b..b1f318a493 100644
--- a/etemplate/inc/class.link_widget.inc.php
+++ b/etemplate/inc/class.link_widget.inc.php
@@ -234,7 +234,7 @@
 						echo "<p>unlink(link-id=$unlink,$value[to_app],$value[to_id])</p>\n";
 						if (is_array($value['to_id'])) _debug_array($value['to_id']);
 					}
-					$this->link->unlink($unlink,$value['to_app'],&$value['to_id']);
+					$this->link->unlink2($unlink,$value['to_app'],$value['to_id']);
 					if (is_array($value['to_id']))
 					{
 						$extension_data['to_id'] = $value['to_id'];	// else changes from unlink get lost
diff --git a/etemplate/inc/class.soetemplate.inc.php b/etemplate/inc/class.soetemplate.inc.php
index 58ce6f6c24..e34c8597ea 100644
--- a/etemplate/inc/class.soetemplate.inc.php
+++ b/etemplate/inc/class.soetemplate.inc.php
@@ -370,7 +370,7 @@
 				{
 					$this->xul_io = CreateObject('etemplate.xul_io');
 				}
-				$loaded = $this->xul_io->import(&$this,$xml);
+				$loaded = $this->xul_io->import($this,$xml);
 
 				if (!is_array($loaded))
 				{
diff --git a/etemplate/inc/class.xul_io.inc.php b/etemplate/inc/class.xul_io.inc.php
index 92be196c02..72d478214c 100644
--- a/etemplate/inc/class.xul_io.inc.php
+++ b/etemplate/inc/class.xul_io.inc.php
@@ -96,7 +96,12 @@
 			);
 		}
 
-		function set_attributes(&$widget,$attr,$val,$spanned='')
+		function set_attributes(&$widget,$attr,$val)
+		{
+			$this->set_attributes2($widget,$attr,$val,$dummy);
+		}
+
+		function set_attributes2(&$widget,$attr,$val,&$spanned)
 		{
 			if ($attr != '')
 			{
@@ -162,7 +167,7 @@
 				$embeded = new etemplate($tpl,$etempl->as_array());
 				if ($embeded_too)
 				{
-					$this->etempl2grid($embeded,&$root,$embeded_too);
+					$this->etempl2grid($embeded,$root,$embeded_too);
 				}
 				$cell['size'] = $embeded->name;
 				unset($embeded);
@@ -181,7 +186,7 @@
 					$embeded = new etemplate($names[$n],$etempl->as_array());
 					if ($embeded_too)
 					{
-						$this->etempl2grid($embeded,&$root,$embeded_too);
+						$this->etempl2grid($embeded,$root,$embeded_too);
 					}
 					$grid = new xmlnode('grid');
 					$grid->set_attribute('id',$embeded->name);
@@ -219,7 +224,7 @@
 					$embeded = new etemplate();
 					if ($embeded->read($name=$embeded->expand_name($cell['name'],0,0),'default','default',0,'',$etempl->as_array()))
 					{
-						$this->etempl2grid($embeded,&$root,$embeded_too);
+						$this->etempl2grid($embeded,$root,$embeded_too);
 					}
 					$cell['name'] = $embeded->name;
 					unset($embeded);
@@ -240,7 +245,7 @@
 				{
 					$attr = $this->attr2xul[$attr];
 				}
-				$this->set_attributes($attr_widget,$attr,$val,&$spanned);
+				$this->set_attributes2($attr_widget,$attr,$val,$spanned);
 			}
 			if ($child)
 			{
@@ -331,7 +336,7 @@
 			$xul_overlay = new xmlnode('overlay');
 
 			$embeded_too = True;
-			$this->etempl2grid($etempl,&$xul_overlay,$embeded_too);
+			$this->etempl2grid($etempl,$xul_overlay,$embeded_too);
 
 			$doc->add_root($xul_overlay);
 			$xml = $doc->export_xml();
@@ -492,7 +497,7 @@
 							$tab_attr['span'] .= $tab_attr['class'] ? ','.$tab_attr['class'] : '';
 							unset($tab_attr['class']);
 							
-							$this->add_cell($etempl,$tab_attr,&$box,&$col,$node['level']);
+							$this->add_cell($etempl,$tab_attr,$box,$col,$node['level']);
 							unset($tab_attr);
 						}
 						break;
@@ -521,7 +526,7 @@
 						}
 						else
 						{
-							$this->add_cell($etempl,$menulist_attr,&$box,&$col,$node['level']);
+							$this->add_cell($etempl,$menulist_attr,$box,$col,$node['level']);
 							unset($menulist_attr);
 						}
 						break; 
@@ -536,7 +541,7 @@
 							$cell = &$box[$node['level']];
 							$cell['size'] = $cell['anz'] . ($cell['size'] != '' ? ','.$cell['size'] : '');
 							unset($cell['anz']);
-							$this->add_cell($etempl,$cell,&$box,&$col,$node['level']);
+							$this->add_cell($etempl,$cell,$box,$col,$node['level']);
 							unset($box[$node['level']]);
 						}
 						break;
@@ -595,7 +600,7 @@
 						{
 							break;
 						}
-						$this->add_cell($etempl,$attr,&$box,&$col,$node['level']);
+						$this->add_cell($etempl,$attr,$box,$col,$node['level']);
 						break;
 				}
 			}
diff --git a/infolog/inc/class.bolink.inc.php b/infolog/inc/class.bolink.inc.php
index a6a6b2c5d7..3863b1381b 100644
--- a/infolog/inc/class.bolink.inc.php
+++ b/infolog/inc/class.bolink.inc.php
@@ -311,10 +311,15 @@
 		@param $link_id link-id to remove if > 0
 		@param $app,$id,$owner,$app2,$id2 if $link_id <= 0: removes all links matching the non-empty params
 		@discussion Note: if $link_id != '' and $id is an array: unlink removes links from that array only
-			unlink has to be called with &$id so see the result !!!
+			unlink has to be called with &$id to see the result (depricated) or unlink2 has to be used !!!
 		@result the number of links deleted
 		*/
 		function unlink($link_id,$app='',$id='',$owner='',$app2='',$id2='')
+		{
+			return unlink2($link_id,$app,$id,$owner,$app2,$id2);
+		}
+
+		function unlink2($link_id,$app,&$id,$owner='',$app2='',$id2='')
 		{
 			if ($link_id < 0)	// vfs-link?
 			{