diff --git a/setup/extensionsmap.class.inc.php b/setup/extensionsmap.class.inc.php
index a5b95f517..e2d9091eb 100644
--- a/setup/extensionsmap.class.inc.php
+++ b/setup/extensionsmap.class.inc.php
@@ -284,7 +284,7 @@ class iTopExtensionsMap
 
 	public function RemoveExtension(string $sCode): void
 	{
-		$oExtension = $this->Get($sCode);
+		$oExtension = $this->GetFromExtensionCode($sCode);
 		if (is_null($oExtension)) {
 			\IssueLog::Error(__METHOD__.": cannot find extension to remove", null, [$sCode]);
 
@@ -317,7 +317,7 @@ class iTopExtensionsMap
 
 		$aRes = [];
 		foreach (array_diff($aExtensionsFromDb, $aSelectedExtensions) as $sExtensionCode) {
-			$oExtension = $this->Get($sExtensionCode);
+			$oExtension = $this->GetFromExtensionCode($sExtensionCode);
 			if (!is_null($oExtension) && $oExtension->bVisible && $oExtension->sSource != iTopExtension::SOURCE_WIZARD) {
 
 				\SetupLog::Info(__METHOD__."$sExtensionCode", null, ['visible' => $oExtension->bVisible, 'mandatory' => $oExtension->bMandatory]);
@@ -510,7 +510,7 @@ class iTopExtensionsMap
 	 */
 	public function MarkAsChosen($sExtensionCode, $bMark = true)
 	{
-		$oExtension = $this->Get($sExtensionCode);
+		$oExtension = $this->GetFromExtensionCode($sExtensionCode);
 		if (!is_null($oExtension)) {
 			$oExtension->bMarkedAsChosen = $bMark;
 		}
@@ -518,7 +518,7 @@ class iTopExtensionsMap
 
 	public function MarkAsUninstallable($sExtensionCode, $bMark = true)
 	{
-		$oExtension = $this->Get($sExtensionCode);
+		$oExtension = $this->GetFromExtensionCode($sExtensionCode);
 		if (!is_null($oExtension)) {
 			$oExtension->bUninstallable = $bMark;
 		}
@@ -531,7 +531,7 @@ class iTopExtensionsMap
 	 */
 	public function IsMarkedAsChosen($sExtensionCode)
 	{
-		$oExtension = $this->Get($sExtensionCode);
+		$oExtension = $this->GetFromExtensionCode($sExtensionCode);
 		if (!is_null($oExtension)) {
 			return $oExtension->bMarkedAsChosen;
 		}
@@ -547,7 +547,7 @@ class iTopExtensionsMap
 	 */
 	protected function SetInstalledVersion($sExtensionCode, $sInstalledVersion)
 	{
-		$oExtension = $this->Get($sExtensionCode);
+		$oExtension = $this->GetFromExtensionCode($sExtensionCode);
 		if (!is_null($oExtension)) {
 			$oExtension->sInstalledVersion = $sInstalledVersion;
 		}
diff --git a/setup/runtimeenv.class.inc.php b/setup/runtimeenv.class.inc.php
index 705e3641a..455009aab 100644
--- a/setup/runtimeenv.class.inc.php
+++ b/setup/runtimeenv.class.inc.php
@@ -76,7 +76,7 @@ class RunTimeEnvironment
 		// mark as (automatically) chosen alll the "remote" modules present in the
 		// target environment (data/<target-env>-modules)
 		// The actual choices will be recorded by RecordInstallation below
-		$this->oExtensionsMap = new iTopExtensionsMap($this->sTargetEnv, true, $aExtraDirs);
+		$this->oExtensionsMap = new iTopExtensionsMap($this->sTargetEnv, $aExtraDirs);
 		$this->oExtensionsMap->LoadChoicesFromDatabase($oSourceConfig);
 	}