diff --git a/src/serverprotocol/PasLS.General.pas b/src/serverprotocol/PasLS.General.pas
index 2669aff..ef1daa5 100644
--- a/src/serverprotocol/PasLS.General.pas
+++ b/src/serverprotocol/PasLS.General.pas
@@ -343,6 +343,7 @@ function TInitialize.Process(var Params : TLSPInitializeParams): TInitializeResu
     Paths.Sorted:=True;
     Paths.Duplicates:=dupIgnore;
 
+    Result.capabilities.ApplySettings(Opt);
     Result.capabilities.executeCommandProvider.commands.Clear;
     CommandFactory.GetCommandList(Result.capabilities.executeCommandProvider.commands);
 
diff --git a/src/serverprotocol/PasLS.References.pas b/src/serverprotocol/PasLS.References.pas
index 421839a..7559cf4 100644
--- a/src/serverprotocol/PasLS.References.pas
+++ b/src/serverprotocol/PasLS.References.pas
@@ -29,7 +29,7 @@ interface
   { Code Tools }
   CodeToolManager, CodeCache, CTUnitGraph,
   { LazUtils }
-  LazFileUtils, AVL_Tree,
+  LazFileUtils, Laz_AVL_Tree,
   { Protocol }
   LSP.BaseTypes, LSP.Base, LSP.Basic, LSP.General, LSP.Messages, LSP.References;