diff --git a/IdHTTPWebsocketClient.pas b/IdHTTPWebsocketClient.pas
index ec94c68..6acfe71 100644
--- a/IdHTTPWebsocketClient.pas
+++ b/IdHTTPWebsocketClient.pas
@@ -1153,8 +1153,7 @@ begin
         FChannels.UnlockList;
       strmEvent.Free;
     end;
-  end
-  else
+  end;
 end;
 
 procedure TIdWebsocketMultiReadThread.RemoveClient(
diff --git a/IdIOHandlerWebsocket.pas b/IdIOHandlerWebsocket.pas
index defe9cb..1f3fc74 100644
--- a/IdIOHandlerWebsocket.pas
+++ b/IdIOHandlerWebsocket.pas
@@ -81,6 +81,8 @@ type
     class property UseSingleWriteThread: Boolean read FUseSingleWriteThread write FUseSingleWriteThread;
   end;
 
+  TThreadID = NativeUInt;
+
   TIdWebsocketQueueThread = class(TThread)
   private
     function GetThreadID: TThreadID;
@@ -1036,7 +1038,7 @@ end;
 
 procedure TIdWebsocketQueueThread.Execute;
 begin
-  TThread.NameThreadForDebugging(Self.ClassName);
+  TThread.NameThreadForDebugging(ansistring(Self.ClassName));
 
   while not Terminated do
   begin