diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 5c4291ff3f3..fe735cb2499 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -430,7 +430,6 @@ print "<br>\n";
 
 if ($mode == 'common')
 {
-    
     print '<form method="GET" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -763,13 +762,20 @@ if ($mode == 'common')
         }
 
         print "</tr>\n";
-
     }
     
-    print "</table>\n";
-    print '</div>';
+    if ($oldfamily)
+    {
+        print "</table>\n";
+        print '</div>';
+    }
     
     dol_fiche_end();
+    
+    // Show warning about external users
+    print info_admin(showModulesExludedForExternal($modules))."\n";
+    
+    print '</form>';
 }
 
 if ($mode == 'marketplace')
@@ -909,9 +915,6 @@ if ($mode == 'deploy')
 }
 
 
-// Show warning about external users
-if ($mode == 'common') print info_admin(showModulesExludedForExternal($modules))."\n";
-
 
 llxFooter();
 
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index ad800708522..e52f8bf98ec 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -588,7 +588,7 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayrep
 	if (empty($srcfile) || empty($destfile)) return -1;
 
 	$destexists=dol_is_dir($destfile);
-	//if (! $overwriteifexists && $destexists) return 0;	// The overwriteifexists is for files only, so propaated to dol_copy only.
+	//if (! $overwriteifexists && $destexists) return 0;	// The overwriteifexists is for files only, so propagated to dol_copy only.
     
     if (! $destexists)
     {
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index 7336a020fa6..b717bafc57c 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -7,9 +7,9 @@ NewModule=New module
 ModuleKey=Key for new module
 ModuleInitialized=Module initialized
 ModuleBuilderDescdescription=Enter here all general information that describe your module
-ModuleBuilderDescobjects=Define here the new objects you want to manage with our module. A page to list them and a page to create/edit/view a card will be generated.
+ModuleBuilderDescobjects=Define here the new objects you want to manage with your module. A page to list them and a page to create/edit/view a card will be generated.
 ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
-ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with our module.
+ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
 ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file with your IDE.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module. Just click on button to get your module package file.
 BuildPackage=Build package