diff --git a/lcl/lclproc.pas b/lcl/lclproc.pas
index 85a77a3d38..01f1f30c4c 100644
--- a/lcl/lclproc.pas
+++ b/lcl/lclproc.pas
@@ -80,8 +80,9 @@ type
   TDebugLCLItems = class
   private
     FItems: TAvgLvlTree;// tree of TDebugLCLItemInfo
+    FName: string;
   public
-    constructor Create;
+    constructor Create(const TheName: string);
     destructor Destroy; override;
     function FindInfo(p: Pointer; CreateIfNotExists: boolean = false
                       ): TDebugLCLItemInfo;
@@ -90,6 +91,7 @@ type
     function MarkCreated(p: Pointer; const InfoText: string): TDebugLCLItemInfo;
     procedure MarkDestroyed(p: Pointer);
     function GetInfo(p: Pointer; WithStackTraces: boolean): string;
+    property Name: string read FName;
   end;
 
   TLineInfoCacheItem = record
@@ -2459,10 +2461,15 @@ procedure UTF8FixBroken(P: PChar);
 begin
   if p=nil then exit;
   while p^<>#0 do begin
-    if ord(p^)<%11000000 then begin
+    if ord(p^)<%10000000 then begin
       // regular single byte character
       inc(p);
     end
+    else if ord(p^)<%11000000 then begin
+      // invalid
+      p^:=' ';
+      inc(p);
+    end
     else if ((ord(p^) and %11100000) = %11000000) then begin
       // should be 2 byte character
       if (ord(p[1]) and %11000000) = %10000000 then
@@ -2497,10 +2504,14 @@ end;
 function UTF8CharacterStrictLength(P: PChar): integer;
 begin
   if p=nil then exit(0);
-  if ord(p^)<%11000000 then begin
+  if ord(p^)<%10000000 then begin
     // regular single byte character
     exit(1);
   end
+  else if ord(p^)<%11000000 then begin
+    // invalid single byte character
+    exit(0);
+  end
   else if ((ord(p^) and %11100000) = %11000000) then begin
     // should be 2 byte character
     if (ord(p[1]) and %11000000) = %10000000 then
@@ -3227,8 +3238,9 @@ end;
 
 { TDebugLCLItems }
 
-constructor TDebugLCLItems.Create;
+constructor TDebugLCLItems.Create(const TheName: string);
 begin
+  FName:=TheName;
   FItems:=TAvgLvlTree.Create(@CompareDebugLCLItemInfos);
 end;
 
@@ -3307,6 +3319,7 @@ begin
     RaiseDoubleDestroyed;
   Info.IsDestroyed:=true;
   GetStackTracePointers(Info.DestructionStack);
+  //DebugLn(['TDebugLCLItems.MarkDestroyed ',dbgs(p)]);
 end;
 
 function TDebugLCLItems.GetInfo(p: Pointer; WithStackTraces: boolean): string;
@@ -3347,6 +3360,8 @@ begin
   Info.Info:=InfoText;
   GetStackTracePointers(Info.CreationStack);
   SetLength(Info.DestructionStack,0);
+  //DebugLn(['TDebugLCLItems.MarkCreated ',Name,' ',dbgs(p),' ',FItems.Count]);
+  //DebugLn(GetStackTrace(true));
   Result:=Info;
 end;
 
@@ -3377,7 +3392,7 @@ initialization
   InterfaceInitializationHandlers := TFPList.Create;
   InterfaceFinalizationHandlers := TFPList.Create;
   {$IFDEF DebugLCLComponents}
-  DebugLCLComponents:=TDebugLCLItems.Create;
+  DebugLCLComponents:=TDebugLCLItems.Create('LCLComponents');
   {$ENDIF}
 finalization
   InterfaceInitializationHandlers.Free;
diff --git a/lcl/lconvencoding.pas b/lcl/lconvencoding.pas
index a6d3b6e64c..0f01b82699 100644
--- a/lcl/lconvencoding.pas
+++ b/lcl/lconvencoding.pas
@@ -4481,6 +4481,7 @@ begin
       inc(p);
     end else begin
       i:=UTF8CharacterStrictLength(@s[p]);
+      DebugLn(['GuessEncoding ',i,' ',DbgStr(s[p])]);
       if i=0 then begin
         {$IFDEF VerboseIDEEncoding}
         DebugLn(['GuessEncoding non UTF-8 found at ',p,' ',dbgstr(copy(s,p-10,20))]);