diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 3363548095f..611d7d791ec 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -306,7 +306,7 @@ if (empty($reshook))
 				if (empty($array_of_total_ht_per_vat_rate[$line->tva_tx.'_'.$line->vat_src_code])) $array_of_total_ht_per_vat_rate[$line->tva_tx.'_'.$line->vat_src_code] = 0;
 				if (empty($array_of_total_ht_devise_per_vat_rate[$line->tva_tx.'_'.$line->vat_src_code])) $array_of_total_ht_devise_per_vat_rate[$line->tva_tx.'_'.$line->vat_src_code] = 0;
 				$array_of_total_ht_per_vat_rate[$line->tva_tx.'_'.$line->vat_src_code] += $line->total_ht;
-				$array_of_total_ht_devise_per_vat_rate[$line->tva_tx.'_'.$line->vat_src_code] += $line->multicurrency_subprice;
+				$array_of_total_ht_devise_per_vat_rate[$line->tva_tx.'_'.$line->vat_src_code] += $line->multicurrency_total_ht;
 			}
 
 			//var_dump($array_of_total_ht_per_vat_rate);exit;
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index f97c6efed1c..fef0265e24c 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -163,7 +163,7 @@ function dolWebsiteReplacementOfLinks($website, $content, $removephppart = 0, $c
 	$content = str_replace('href="'.DOL_URL_ROOT.'/document.php', 'href="!~!~!~'.DOL_URL_ROOT.'/document.php', $content);
 
 	// Replace relative link '/' with dolibarr URL
-	$content = preg_replace('/(href=")\/\"/', '\1!~!~!~'.DOL_URL_ROOT.'/website/index.php?website='.$website->ref.'&pageid='.$website->fk_default_home.'"', $content, -1, $nbrep);
+	$content = preg_replace('/(href=")\/(#[^\"<>]*)?\"/', '\1!~!~!~'.DOL_URL_ROOT.'/website/index.php?website='.$website->ref.'&pageid='.$website->fk_default_home.'\2"', $content, -1, $nbrep);
 	// Replace relative link /xxx.php#aaa or /xxx.php with dolibarr URL (we discard param ?...)
 	$content = preg_replace('/(href=")\/?([^:\"\!]*)\.php(#[^\"<>]*)?\"/', '\1!~!~!~'.DOL_URL_ROOT.'/website/index.php?website='.$website->ref.'&pageref=\2\3"', $content, -1, $nbrep);
 	// Replace relative link /xxx.php?a=b&c=d#aaa or /xxx.php?a=b&c=d with dolibarr URL
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 5e360739ea4..faf7943107f 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -1061,9 +1061,11 @@ if ($action == 'create')
 	}
 	else
 	{
+		print '<form name="fichinter" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+
 		dol_fiche_head('');
 
-		print '<form name="fichinter" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
 		if (is_object($objectsrc))
 		{
 			print '<input type="hidden" name="origin"         value="'.$objectsrc->element.'">';
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 85b50b3d13b..ac255693b0d 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -841,6 +841,13 @@ if ($action == 'addcontainer')
 				{
 					$error++;
 					setEventMessages($object->error, $object->errors, 'errors');
+				} else {
+					$filetpl = $pathofwebsite.'/page'.$pageid.'.tpl.php';
+
+					// Generate the index.php page to be the home page
+					$result = dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper);
+
+					if ($result <= 0) setEventMessages('Failed to write file '.$fileindex, null, 'errors');
 				}
 			}
 		}
@@ -1312,8 +1319,9 @@ if ($action == 'setashome')
 	{
 		$db->commit();
 
+		$filetpl = $pathofwebsite.'/page'.$pageid.'.tpl.php';
+
 		// Generate the index.php page to be the home page
-		//-------------------------------------------------
 		$result = dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper);
 
 		if ($result) setEventMessages($langs->trans("Saved"), null, 'mesgs');