diff --git a/components/codetools/finddeclarationtool.pas b/components/codetools/finddeclarationtool.pas
index c70a7801f1..9bead334e2 100644
--- a/components/codetools/finddeclarationtool.pas
+++ b/components/codetools/finddeclarationtool.pas
@@ -6331,6 +6331,8 @@ begin
       AVLNode:=FInterfaceIdentifierCache.Items.FindSuccessor(AVLNode);
     end;
   end else begin
+    Assert(Assigned(FInterfaceIdentifierCache),
+      'TFindDeclarationTool.FindIdentifierInInterface: FInterfaceIdentifierCache is not assigned');
     CacheEntry:=FInterfaceIdentifierCache.FindIdentifier(Params.Identifier);
     if CacheEntry=nil then
       exit(false);
diff --git a/converter/convertdelphi.pas b/converter/convertdelphi.pas
index 149a8e1095..6a82dce7e8 100644
--- a/converter/convertdelphi.pas
+++ b/converter/convertdelphi.pas
@@ -1066,6 +1066,8 @@ begin
   if not fSettings.SameDfmFile then begin
     fSettings.AddLogLine('');
     fSettings.AddLogLine(lisConvDelphiRepairingFormFiles);
+    DebugLn('');
+    DebugLn('TConvertDelphiProjPack.ConvertAllFormFiles: '+lisConvDelphiRepairingFormFiles);
   end;
   Screen.Cursor:=crHourGlass;
   try
@@ -1577,6 +1579,8 @@ begin
   try
     fSettings.AddLogLine('');
     fSettings.AddLogLine(lisConvDelphiFindAllUnitFiles);
+    DebugLn('');
+    DebugLn('TConvertDelphiProject.FindAllUnits: '+lisConvDelphiFindAllUnitFiles);
     if not CodeToolBoss.FindDelphiProjectUnits(fMainUnitConverter.fPascalBuffer,
                                          FoundUnits, MisUnits, NormalUnits) then
     begin
@@ -1918,6 +1922,10 @@ begin
   MisUnits:=nil;
   NormalUnits:=nil;
   try
+    fSettings.AddLogLine('');
+    fSettings.AddLogLine(lisConvDelphiFindAllUnitFiles);
+    DebugLn('');
+    DebugLn('TConvertDelphiPackage.FindAllUnits: '+lisConvDelphiFindAllUnitFiles);
     if not CodeToolBoss.FindDelphiPackageUnits(fMainUnitConverter.fPascalBuffer,
                                          FoundUnits, MisUnits, NormalUnits) then
     begin
diff --git a/converter/missingpropertiesdlg.pas b/converter/missingpropertiesdlg.pas
index a3693943b1..db1235d8c0 100644
--- a/converter/missingpropertiesdlg.pas
+++ b/converter/missingpropertiesdlg.pas
@@ -527,6 +527,7 @@ begin
   LoopCount:=0;    // Prevent possible eternal loops with a counter
   repeat
     repeat
+      DebugLn('TLFMFixer.ConvertAndRepair: Checking LFM for '+fPascalBuffer.Filename);
       if not fLFMTree.ParseIfNeeded then exit;
       if CodeToolBoss.CheckLFM(fPascalBuffer, fLFMBuffer, fLFMTree,
           fRootMustBeClassInUnit, fRootMustBeClassInIntf, fObjectsMustExist) then
@@ -544,6 +545,8 @@ begin
       Result:=mrOk
     else begin
       Result:=FindAndFixMissingComponentClasses; // Can return mrRetry.
+      if Result=mrRetry then
+        DebugLn('TLFMFixer.ConvertAndRepair: Added unit to uses section -> another loop');
     end;
     Inc(LoopCount);                    // Increment also in outer loop
   until (Result in [mrOK, mrAbort]) or (LoopCount>MaxLoopCount);