diff --git a/server/fhirconsole.lpi b/server/fhirconsole.lpi
index d037f5ac8..48d7ba81a 100644
--- a/server/fhirconsole.lpi
+++ b/server/fhirconsole.lpi
@@ -126,7 +126,7 @@
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir);..\library"/>
-            <Libraries Value="\usr\local\lib64"/>
+            <Libraries Value="\usr\local\lib64\"/>
             <OtherUnitFiles Value="admin;tx;..\library\fsl\tests;..\library\fhir\tests;..\library\fhir4\tests;..\library\fhir4b\tests;..\library\fhir5\tests;..\library\ftx\tests;..\library\fxver\tests;..\library\cda\tests;..\library\v2\tests;..\library\fdb\tests;modules;tests;..\library\fcomp\tests"/>
             <UnitOutputDirectory Value="lib\console\$(BuildMode)"/>
           </SearchPaths>
@@ -279,7 +279,7 @@
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir);..\library"/>
-            <Libraries Value="\usr\local\lib64"/>
+            <Libraries Value="\usr\local\lib64\"/>
             <OtherUnitFiles Value="admin;tx;..\library\fsl\tests;..\library\fhir\tests;..\library\fhir4\tests;..\library\fhir4b\tests;..\library\fhir5\tests;..\library\ftx\tests;..\library\fxver\tests;..\library\cda\tests;..\library\v2\tests;..\library\fdb\tests;modules;tests;..\library\fcomp\tests"/>
             <UnitOutputDirectory Value="lib\console\$(BuildMode)"/>
           </SearchPaths>
@@ -474,7 +474,7 @@
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir);..\library;..\library\fsl\tests"/>
       <Libraries Value="..\dependencies\openssl\$(TargetOS)-$(TargetCPU)"/>
-      <OtherUnitFiles Value="admin;tx;..\dependencies\FMM;..\library\fsl\tests;..\library\fcomp\tests;..\library\v2\tests;..\library\cda\tests;..\library\fdb\tests;..\library\ftx\tests;tests"/>
+      <OtherUnitFiles Value="admin;tx;..\dependencies\FMM;..\library\fsl\tests;..\library\fcomp\tests;..\library\v2\tests;..\library\cda\tests;..\library\fdb\tests;..\library\ftx\tests;tests;..\library\fhir4\tests;..\library\fhir4b\tests;..\library\fhir\tests;..\library\fhir5\tests;..\library\fxver\tests"/>
       <UnitOutputDirectory Value="lib\$(BuildMode)"/>
     </SearchPaths>
     <Parsing>
diff --git a/toolkit2/dialogs/dlg_igpub_github.pas b/toolkit2/dialogs/dlg_igpub_github.pas
index 90ccb8e81..096460e55 100644
--- a/toolkit2/dialogs/dlg_igpub_github.pas
+++ b/toolkit2/dialogs/dlg_igpub_github.pas
@@ -239,7 +239,7 @@ function TIgGitHubDialog.cloneIg: boolean;
 
 procedure TIgGitHubDialog.doLine(sender: TFslExternalProcessThread; line: String; repl : boolean);
 begin
-  FLock.Lock;
+  FLock.Lock('git.line');
   try
     if (repl) then
       FLines.add('t'+line)
@@ -262,7 +262,7 @@ procedure TIgGitHubDialog.Timer1Timer(Sender: TObject);
   s : String;
   ok : boolean;
 begin
-  FLock.Lock;
+  FLock.Lock('git.timer');
   try
     ok := false;
     for s in FLines do
diff --git a/toolkit2/fhirtoolkit.lpi b/toolkit2/fhirtoolkit.lpi
index a58fda29f..4d69cadbd 100644
--- a/toolkit2/fhirtoolkit.lpi
+++ b/toolkit2/fhirtoolkit.lpi
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
     <Version Value="12"/>
@@ -18,7 +19,6 @@
       <MajorVersionNr Value="3"/>
       <MinorVersionNr Value="5"/>
       <RevisionNr Value="1"/>
-      <Attributes pvaDebug="False"/>
     </VersionInfo>
     <BuildModes>
       <Item Name="default" Default="True"/>
@@ -232,7 +232,10 @@
             <CompilerMessages>
               <IgnoredMessages idx6058="True" idx5024="True"/>
             </CompilerMessages>
-            <CustomOptions Value="-WM11.0&#10;-XR/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk&#10;-gw2&#10;-gw3"/>
+            <CustomOptions Value="-WM11.0
+-XR/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
+-gw2
+-gw3"/>
           </Other>
         </CompilerOptions>
       </Item>
diff --git a/toolkit2/frames/ftk_frame_igpub.pas b/toolkit2/frames/ftk_frame_igpub.pas
index 0922da8cc..e4368532c 100644
--- a/toolkit2/frames/ftk_frame_igpub.pas
+++ b/toolkit2/frames/ftk_frame_igpub.pas
@@ -327,7 +327,7 @@ procedure TIGPublicationManager.updateMemo;
   begin
     ts := TStringlist.Create;
     try
-      FLock.Lock;
+      FLock.Lock('updmemo');
       try
         for i := FCurrentLine to FCurrent.lines.count - 1 do
           ts.add(FCurrent.lines[i]);
@@ -831,7 +831,7 @@ procedure TIGPublicationFolder.SetEngine(AValue: TIgPublisherBuildBaseEngine);
 
 procedure TIGPublicationFolder.emitLine(line: String; repl : boolean);
 begin
-  FManager.FLock.Lock;
+  FManager.FLock.Lock('emit');
   try
     if repl then
       FLines.add('t'+line)
@@ -849,7 +849,7 @@ function TIGPublicationFolder.log: String;
 begin
   b := TFslStringBuilder.Create;
   try
-    FManager.FLock.Lock;
+    FManager.FLock.Lock('log');
     try
       for s in FLines do
       begin
diff --git a/toolkit2/ftk_fhir_context_2.pas b/toolkit2/ftk_fhir_context_2.pas
index 13af71f9e..105b845dd 100644
--- a/toolkit2/ftk_fhir_context_2.pas
+++ b/toolkit2/ftk_fhir_context_2.pas
@@ -39,7 +39,7 @@ interface
   fhir_objects, fhir_factory, fhir_client, fhir_common,
   ftx_service,
   fhir2_types, fhir2_resources, fhir2_resources_base, fhir2_context, fhir2_profiles, fhir2_client,
-  fhir_valuesets;
+  fhir_tx, fhir_valuesets;
 
 Type
 
diff --git a/toolkit2/ftk_fhir_context_3.pas b/toolkit2/ftk_fhir_context_3.pas
index 9e7051d0c..0adcbd932 100644
--- a/toolkit2/ftk_fhir_context_3.pas
+++ b/toolkit2/ftk_fhir_context_3.pas
@@ -38,7 +38,7 @@ interface
   fhir_objects, fhir_factory, fhir_client, fhir_common,
   ftx_service,
   fhir3_types, fhir3_resources, fhir3_resources_base, fhir3_context, fhir3_profiles, fhir3_client,
-  fhir_valuesets;
+  fhir_tx, fhir_valuesets;
 
 Type
 
diff --git a/toolkit2/ftk_fhir_context_4.pas b/toolkit2/ftk_fhir_context_4.pas
index c1b36fb45..b5619bc31 100644
--- a/toolkit2/ftk_fhir_context_4.pas
+++ b/toolkit2/ftk_fhir_context_4.pas
@@ -39,7 +39,7 @@ interface
   fhir_objects, fhir_factory, fhir_client, fhir_common, fhir_utilities,
   ftx_service,
   fhir4_types, fhir4_resources, fhir4_resources_base, fhir4_context, fhir4_profiles, fhir4_client,
-  fhir_valuesets;
+  fhir_tx, fhir_valuesets;
 
 Type
 
diff --git a/toolkit2/ftk_fhir_context_5.pas b/toolkit2/ftk_fhir_context_5.pas
index 1bc034dbb..6d43f5ebd 100644
--- a/toolkit2/ftk_fhir_context_5.pas
+++ b/toolkit2/ftk_fhir_context_5.pas
@@ -39,7 +39,7 @@ interface
   fhir_objects, fhir_factory, fhir_client, fhir_common,
   ftx_service,
   fhir5_enums, fhir5_types, fhir5_resources, fhir5_resources_base, fhir5_context, fhir5_profiles, fhir5_client,
-  fhir_valuesets;
+  fhir_tx, fhir_valuesets;
 
 Type
 
diff --git a/toolkit2/views/ftk_console.pas b/toolkit2/views/ftk_console.pas
index 940b208ed..92494c03c 100644
--- a/toolkit2/views/ftk_console.pas
+++ b/toolkit2/views/ftk_console.pas
@@ -72,7 +72,7 @@ procedure TToolkitConsole.newDay(const s: String);
 
 procedure TToolkitConsole.log(const s: String);
 begin
-  FLock.Lock;
+  FLock.Lock('console.log');
   try
     FLines.add(s);
   finally
@@ -120,7 +120,7 @@ destructor TToolkitConsole.Destroy;
 
 procedure TToolkitConsole.GetIncoming(list: TStringList);
 begin
-  FLock.Lock;
+  FLock.Lock('console.incoming');
   try
     list.assign(FLines);
     FLines.Clear;