diff --git a/IdIOHandlerWebsocket.pas b/IdIOHandlerWebsocket.pas
index 642684c..9219ece 100644
--- a/IdIOHandlerWebsocket.pas
+++ b/IdIOHandlerWebsocket.pas
@@ -30,8 +30,8 @@ type
   {.$ifend}
 {$IFDEF WS_NO_SSL}
   TIdIOHandlerWebsocket = class(TIdIOHandlerStack)
-{ELSE}
-  TIdIOHandlerWebsocketSSL = class(TIdSSLIOHandlerSocketOpenSSL)
+{$ELSE}
+  TIdIOHandlerWebsocket = class(TIdSSLIOHandlerSocketOpenSSL)
 {$ENDIF}
   private
     FIsServerSide: Boolean;
@@ -268,12 +268,12 @@ begin
 end;
 
 {$IFNDEF WS_NO_SSL}
-procedure TIdIOHandlerWebsocketSSL.ClearSSLOptions;
+procedure TIdIOHandlerWebsocket.ClearSSLOptions;
 begin
   self.fxSSLOptions.Free;
   self.fxSSLOptions := nil;
 end;
-{$ENDIF
+{$ENDIF}
 
 procedure TIdIOHandlerWebsocket.Close;
 var
@@ -1152,7 +1152,7 @@ begin
     repeat
       result := inherited WriteDataToTarget(bdata,iOffset, (iDataLength-ioffset));
       Inc(ioffset, Result);
-    until ioffset >= iDataLenght;
+    until ioffset >= iDataLength;
 
 //    if debughook > 0 then
 //      OutputDebugString(PChar(Format('Written (TID:%d, P:%d): %s',
diff --git a/IdServerIOHandlerWebsocket.pas b/IdServerIOHandlerWebsocket.pas
index f863847..ed63e4d 100644
--- a/IdServerIOHandlerWebsocket.pas
+++ b/IdServerIOHandlerWebsocket.pas
@@ -12,7 +12,7 @@ uses
   IdIOHandlerWebsocket;
 
 type
-{$IFNDEF WS_NO_SSL}
+{$IFDEF WS_NO_SSL}
   TIdServerIOHandlerWebsocket = class(TIdServerIOHandlerStack)
 {$ELSE}
   TIdServerIOHandlerWebsocket = class(TIdServerIOHandlersslOpenSSL)
@@ -33,7 +33,7 @@ function TIdServerIOHandlerWebsocket.Accept(ASocket: TIdSocketHandle;
   AListenerThread: TIdThread; AYarn: TIdYarn): TIdIOHandler;
 {$IFNDEF WS_NO_SSL}
 var
-  LIO: TIdIOHandlerWebsocketSSL;
+  LIO: TIdIOHandlerWebsocket;
 {$ENDIF}
 begin
 {$IFDEF WS_NO_SSL}
@@ -75,8 +75,9 @@ end;
 procedure TIdServerIOHandlerWebsocket.InitComponent;
 begin
   inherited InitComponent;
-//TODO: Check if this is necessary for SSL
+{$IFDEF WS_NO_SSL}
   IOHandlerSocketClass := TIdIOHandlerWebsocket;
+{$ENDIF}
 end;
 
 function TIdServerIOHandlerWebsocket.MakeClientIOHandler(