diff --git a/htdocs/core/lib/emaillayout.lib.php b/htdocs/core/lib/emaillayout.lib.php
index 53753e46a45..1502d9266b8 100644
--- a/htdocs/core/lib/emaillayout.lib.php
+++ b/htdocs/core/lib/emaillayout.lib.php
@@ -32,8 +32,7 @@ function getHtmlOfLayout($name)
 {
 	global $conf, $mysoc, $user, $langs;
 
-	$substitutionarray = array();
-	$substitutionarray = getCommonSubstitutionArray($langs, 1);
+	$substitutionarray = getCommonSubstitutionArray($langs);
 
 	// TODO Read template from a file "install/doctemplates/maillayout/xxx.html"
 
diff --git a/htdocs/install/mysql/data/llx_c_productbatch_qcstatus.sql b/htdocs/install/mysql/data/llx_c_productbatch_qcstatus-productbatch.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_productbatch_qcstatus.sql
rename to htdocs/install/mysql/data/llx_c_productbatch_qcstatus-productbatch.sql
diff --git a/htdocs/install/mysql/data/llx_c_ticket_category.sql b/htdocs/install/mysql/data/llx_c_ticket_category-ticket.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_ticket_category.sql
rename to htdocs/install/mysql/data/llx_c_ticket_category-ticket.sql
diff --git a/htdocs/install/mysql/data/llx_c_ticket_resolution.sql b/htdocs/install/mysql/data/llx_c_ticket_resolution-ticket.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_ticket_resolution.sql
rename to htdocs/install/mysql/data/llx_c_ticket_resolution-ticket.sql
diff --git a/htdocs/install/mysql/data/llx_c_ticket_severity.sql b/htdocs/install/mysql/data/llx_c_ticket_severity-ticket.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_ticket_severity.sql
rename to htdocs/install/mysql/data/llx_c_ticket_severity-ticket.sql
diff --git a/htdocs/install/mysql/data/llx_c_ticket_type.sql b/htdocs/install/mysql/data/llx_c_ticket_type-ticket.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_ticket_type.sql
rename to htdocs/install/mysql/data/llx_c_ticket_type-ticket.sql
diff --git a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
index ef323757a30..fc22cefa47b 100644
--- a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
+++ b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
@@ -306,6 +306,7 @@ ALTER TABLE llx_expeditiondet ADD INDEX idx_expeditiondet_fk_elementdet (fk_elem
 
 ALTER TABLE llx_receptiondet_batch CHANGE COLUMN fk_commande fk_element integer;
 ALTER TABLE llx_receptiondet_batch CHANGE COLUMN fk_commandefourndet fk_elementdet integer;
+ALTER TABLE llx_receptiondet_batch ADD INDEX idx_receptiondet_batch_fk_element (fk_element);
 
 ALTER TABLE llx_supplier_proposaldet MODIFY ref_fourn VARCHAR(128) NULL;
 
diff --git a/htdocs/install/mysql/tables/llx_fichinter_rec.key.sql b/htdocs/install/mysql/tables/llx_fichinter_rec.key.sql
index 22711ab3083..5b871866ff5 100644
--- a/htdocs/install/mysql/tables/llx_fichinter_rec.key.sql
+++ b/htdocs/install/mysql/tables/llx_fichinter_rec.key.sql
@@ -20,7 +20,7 @@
 -- ============================================================================
 
 
-ALTER TABLE llx_fichinter_rec ADD UNIQUE INDEX idx_fichinter_rec_uk_titre (titre, entity);
+ALTER TABLE llx_fichinter_rec ADD UNIQUE INDEX idx_fichinter_rec_uk_titre (title, entity);
 
 ALTER TABLE llx_fichinter_rec ADD INDEX idx_fichinter_rec_fk_soc (fk_soc);
 ALTER TABLE llx_fichinter_rec ADD INDEX idx_fichinter_rec_fk_user_author (fk_user_author);
diff --git a/htdocs/install/mysql/tables/llx_receptiondet_batch.key.sql b/htdocs/install/mysql/tables/llx_receptiondet_batch.key.sql
index 4470247061b..2ac537d97f6 100644
--- a/htdocs/install/mysql/tables/llx_receptiondet_batch.key.sql
+++ b/htdocs/install/mysql/tables/llx_receptiondet_batch.key.sql
@@ -16,7 +16,7 @@
 --
 -- ===================================================================
 
-ALTER TABLE llx_receptiondet_batch ADD INDEX idx_receptiondet_batch_fk_commande (fk_commande);
+ALTER TABLE llx_receptiondet_batch ADD INDEX idx_receptiondet_batch_fk_element (fk_element);
 ALTER TABLE llx_receptiondet_batch ADD INDEX idx_receptiondet_batch_fk_reception (fk_reception);
 ALTER TABLE llx_receptiondet_batch ADD CONSTRAINT fk_receptiondet_batch_fk_reception FOREIGN KEY (fk_reception) REFERENCES llx_reception (rowid);
 ALTER TABLE llx_receptiondet_batch ADD INDEX idx_receptiondet_batch_fk_product (fk_product);