diff --git a/jcl/experts/common/JclOtaResources.pas b/jcl/experts/common/JclOtaResources.pas
index be5cbacb6..ccfaf6a44 100644
--- a/jcl/experts/common/JclOtaResources.pas
+++ b/jcl/experts/common/JclOtaResources.pas
@@ -266,7 +266,7 @@ interface
   RsEMapFileNotFound = 'Map file "%s" for project "%s" not found.' +
     'No conversions of debug information were made';
   RsConvertedMapToJdbg = 'Converted MAP file "%s" (%d bytes) to .jdbg (%d bytes)';
-  RsInsertedJdbg = 'Converted MAP file "%s" (%d bytes) and inserted debug information (%d bytes) into the binary';
+  RsInsertedJdbg = 'Converted MAP file "%s" (%d bytes) and inserted debug information (%d bytes) into the binary "%s"';
   RsDeletedMapFile = 'Deleted %s file "%s"';
   RsEFailedToDeleteMapFile = 'Failed to delete %s file "%s"';
   RsEMapConversion = 'Failed to convert MAP file "%s"';
diff --git a/jcl/experts/common/JclOtaUtils.pas b/jcl/experts/common/JclOtaUtils.pas
index 945ef8aa4..48d98a3eb 100644
--- a/jcl/experts/common/JclOtaUtils.pas
+++ b/jcl/experts/common/JclOtaUtils.pas
@@ -202,6 +202,7 @@   TJclOTAExpertBase = class(TInterfacedObject, IJclOTAOptionsCallback)
       var ExecutableFileName: TFileName): Boolean;
     function GetDrcFileName(const Project: IOTAProject): TFileName;
     function GetMapFileName(const Project: IOTAProject): TFileName;
+    function GetTargetFileName(const Project: IOTAProject): TFileName;
     function GetOutputDirectory(const Project: IOTAProject): string;
     function IsInstalledPackage(const Project: IOTAProject): Boolean;
     function IsPackage(const Project: IOTAProject): Boolean;
@@ -1177,6 +1178,19 @@ function TJclOTAExpertBase.GetDrcFileName(const Project: IOTAProject): TFileName
   Result := ChangeFileExt(Project.FileName, CompilerExtensionDRC);
 end;
 
+function TJclOTAExpertBase.GetTargetFileName(const Project: IOTAProject): TFileName;
+begin
+  if not Assigned(Project) then
+    raise EJclExpertException.CreateRes(@RsENoActiveProject);
+  if not Assigned(Project.ProjectOptions) then
+    raise EJclExpertException.CreateRes(@RsENoProjectOptions);
+{$IFDEF BDS2_UP}
+  Result := Project.ProjectOptions.TargetName;
+{$ELSE ~BDS2_UP}
+  Result := '';
+{$ENDIF ~BDS2_UP}
+end;
+
 function TJclOTAExpertBase.GetMapFileName(const Project: IOTAProject): TFileName;
 var
   ProjectFileName: TFileName;
diff --git a/jcl/experts/debug/converter/JclDebugIdeImpl.pas b/jcl/experts/debug/converter/JclDebugIdeImpl.pas
index 1a67f675e..edd74c42c 100644
--- a/jcl/experts/debug/converter/JclDebugIdeImpl.pas
+++ b/jcl/experts/debug/converter/JclDebugIdeImpl.pas
@@ -360,7 +360,10 @@ procedure TJclDebugExtension.AfterCompile(const Project: IOTAProject; Succeeded:
         // insertion of JEDI Debug Information into the binary
         if Succ and (deInsertJdbg in EnabledActions) then
         begin
-          Succ := FindExecutableName(MapFileName, OutputDirectory, ExecutableFileName);
+          ExecutableFileName := GetTargetFileName(Project);
+          Succ := ExecutableFileName <> '';
+          if not Succ then
+            Succ := FindExecutableName(MapFileName, OutputDirectory, ExecutableFileName);
           if Succ then
           begin
             Succ := InsertDebugDataIntoExecutableFile(ExecutableFileName, MapFileName,
@@ -368,7 +371,8 @@ procedure TJclDebugExtension.AfterCompile(const Project: IOTAProject; Succeeded:
             if Succ then
             begin
               if not FQuiet then
-                OutputToolMessage(Format(LoadResString(@RsInsertedJdbg), [MapFileName, MapFileSize, JclDebugDataSize]));
+                OutputToolMessage(Format(LoadResString(@RsInsertedJdbg),
+                  [MapFileName, MapFileSize, JclDebugDataSize, ExecutableFileName]));
             end
             else
               OutputToolMessage(Format(LoadResString(@RsEMapInsertion), [MapFileName]));
diff --git a/jcl/source/vcl/JclOpenDialogFavorites.pas b/jcl/source/vcl/JclOpenDialogFavorites.pas
index e586b5741..e4687fd7f 100644
--- a/jcl/source/vcl/JclOpenDialogFavorites.pas
+++ b/jcl/source/vcl/JclOpenDialogFavorites.pas
@@ -346,6 +346,8 @@ procedure TJclOpenDialogFavoritesHook.FileDialogCreate(
   //CheckOSError(FileDialogCustomize.EndVisualGroup);
   CheckOSError(FileDialogCustomize.MakeProminent(CTRLID_COMBOBOX));
   CheckOSError(AFileDialog.Advise(Self, Unused));
+
+  DoShow;
 end;
 
 procedure TJclOpenDialogFavoritesHook.FileDialogCleanCombobox(
@@ -422,6 +424,7 @@ function TJclOpenDialogFavoritesHook.OnControlActivating(
 
 function TJclOpenDialogFavoritesHook.OnFileOk(const pfd: IFileDialog): HResult;
 begin
+  DoClose;
   Result := S_OK;
 end;