diff --git a/source/apphelpers.pas b/source/apphelpers.pas
index 022a4ccb..9ad8b6ed 100644
--- a/source/apphelpers.pas
+++ b/source/apphelpers.pas
@@ -15,11 +15,8 @@ type
   // Sync with main branch and Delphi structures
   TSynMemo = TSynEdit;
   TVirtualStringTree = TLazVirtualStringTree;
-  TImageIndex = Integer;
   PInt = ^Integer;
   TProgressBarState = (pbsNormal, pbsError, pbsPaused);
-  TTabSet = TTabControl;
-  TSynCompletionProposal = TSynCompletion;
 
   TSortItemOrder = (sioAscending, sioDescending);
   TSortItem = class(TPersistent)
@@ -1369,7 +1366,8 @@ function DetectEncoding(Stream: TStream): TEncoding;
   WithBOM: Boolean;}
 begin
   Result := TEncoding.UTF8
-  {SynEnc := SynUnicode.GetEncoding(Stream, WithBOM);
+  { LConvEncoding.GuessEncoding returns string identifiers, not the TEncoding objects
+  SynEnc := SynUnicode.GetEncoding(Stream, WithBOM);
   case SynEnc of
     seUTF8: begin
       if WithBOM then
diff --git a/source/copytable.pas b/source/copytable.pas
index 81ad49e9..d73fde21 100644
--- a/source/copytable.pas
+++ b/source/copytable.pas
@@ -212,7 +212,7 @@ end;
 
 
 procedure TCopyTableForm.TreeElementsGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode;
-  Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: TImageIndex);
+  Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: Integer);
 begin
   // Get node index
   if not (Kind in [ikNormal, ikSelected]) then Exit;
diff --git a/source/main.pas b/source/main.pas
index 72358e49..1c004410 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -103,7 +103,7 @@ type
       LastSaveTime: Cardinal;
       spltHelpers: TSplitter;
       spltQuery: TSplitter;
-      tabsetQuery: TTabSet;
+      tabsetQuery: TTabControl;
       TabSheet: TTabSheet;
       ResultTabs: TResultTabs;
       DoProfile: Boolean;
@@ -385,7 +385,7 @@ type
     InsertfilesintoBLOBfields3: TMenuItem;
     setNULL1: TMenuItem;
     menuExporttables: TMenuItem;
-    SynCompletionProposal: TSynCompletionProposal;
+    SynCompletionProposal: TSynCompletion;
     tabCommandStats: TTabSheet;
     ListCommandStats: TVirtualStringTree;
     N21: TMenuItem;
@@ -545,7 +545,7 @@ type
     Runroutines1: TMenuItem;
     actCreateEvent: TAction;
     Event1: TMenuItem;
-    tabsetQuery: TTabSet;
+    tabsetQuery: TTabControl;
     actDataSetNull: TAction;
     pnlPreview: TPanel;
     spltPreview: TSplitter;
@@ -915,7 +915,7 @@ type
       Column: TColumnIndex);
     procedure DBtreeGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode;
         Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var
-        ImageIndex: TImageIndex);
+        ImageIndex: Integer);
     procedure DBtreeGetNodeDataSize(Sender: TBaseVirtualTree; var NodeDataSize:
         Integer);
     procedure DBtreeGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column:
@@ -964,7 +964,7 @@ type
       var ContentRect: TRect);
     procedure ListTablesBeforePaint(Sender: TBaseVirtualTree; TargetCanvas: TCanvas);
     procedure ListTablesGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode; Kind: TVTImageKind;
-      Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: TImageIndex);
+      Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: Integer);
     procedure ListTablesGetNodeDataSize(Sender: TBaseVirtualTree; var NodeDataSize: Integer);
     procedure ListTablesGetText(Sender: TBaseVirtualTree; Node: PVirtualNode;
       Column: TColumnIndex; TextType: TVSTTextType; var CellText: string);
@@ -6439,7 +6439,7 @@ end;
 
 
 procedure TMainForm.ListTablesGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode;
-  Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: TImageIndex);
+  Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: Integer);
 var
   Obj: PDBObject;
 begin
@@ -8573,7 +8573,7 @@ end;
 procedure TMainForm.tabsetQueryMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer);
 var
   idx, i: Integer;
-  Tabs: TTabSet;
+  Tabs: TTabControl;
   Rect: TRect;
   Org: TPoint;
   QueryTab: TQueryTab;
@@ -8584,7 +8584,7 @@ begin
   if (FLastHintMousepos.X = x) and (FLastHintMousepos.Y = Y) then
     Exit;
   FLastHintMousepos := Point(X, Y);
-  Tabs := Sender as TTabSet;
+  Tabs := Sender as TTabControl;
   idx := Tabs.IndexOfTabAt(X, Y);
   if (idx = -1) or (idx = FLastHintControlIndex) then
     Exit;
@@ -9603,7 +9603,7 @@ end;
 }
 procedure TMainForm.DBtreeGetImageIndex(Sender: TBaseVirtualTree; Node:
     PVirtualNode; Kind: TVTImageKind; Column: TColumnIndex; var Ghosted:
-    Boolean; var ImageIndex: TImageIndex);
+    Boolean; var ImageIndex: Integer);
 var
   DBObj: PDBObject;
 begin
diff --git a/source/preferences.pas b/source/preferences.pas
index d3092a04..0ac777b4 100644
--- a/source/preferences.pas
+++ b/source/preferences.pas
@@ -1212,7 +1212,7 @@ end;
 
 
 procedure TfrmPreferences.TreeShortcutItemsGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode;
-  Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: TImageIndex);
+  Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: Integer);
 var
   Data: PShortcutItemData;
 begin
diff --git a/source/routine_editor.pas b/source/routine_editor.pas
index 1f671847..dd274366 100644
--- a/source/routine_editor.pas
+++ b/source/routine_editor.pas
@@ -56,7 +56,7 @@ type
       var CellText: String);
     procedure listParametersGetImageIndex(Sender: TBaseVirtualTree;
       Node: PVirtualNode; Kind: TVTImageKind; Column: TColumnIndex;
-      var Ghosted: Boolean; var ImageIndex: TImageIndex);
+      var Ghosted: Boolean; var ImageIndex: Integer);
     procedure btnClearParamsClick(Sender: TObject);
     procedure btnRemoveParamClick(Sender: TObject);
     procedure listParametersBeforePaint(Sender: TBaseVirtualTree;
@@ -294,7 +294,7 @@ end;
 
 procedure TfrmRoutineEditor.listParametersGetImageIndex(Sender: TBaseVirtualTree;
   Node: PVirtualNode; Kind: TVTImageKind; Column: TColumnIndex;
-  var Ghosted: Boolean; var ImageIndex: TImageIndex);
+  var Ghosted: Boolean; var ImageIndex: Integer);
 var
   List: TLazVirtualStringTree;
   Context: String;
diff --git a/source/sqlhelp.pas b/source/sqlhelp.pas
index b25fe66c..fa4b0221 100644
--- a/source/sqlhelp.pas
+++ b/source/sqlhelp.pas
@@ -178,7 +178,7 @@ end;
 
 
 procedure TfrmSQLhelp.treeTopicsGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode;
-  Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: TImageIndex);
+  Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: Integer);
 begin
   // Return open or closed book icon for folders, or document icon for topics
   if not (Kind in [ikNormal, ikSelected]) then
diff --git a/source/tabletools.pas b/source/tabletools.pas
index 11c88e01..0d72f66a 100644
--- a/source/tabletools.pas
+++ b/source/tabletools.pas
@@ -108,7 +108,7 @@ type
     procedure TreeObjectsInitNode(Sender: TBaseVirtualTree; ParentNode, Node: PVirtualNode;
       var InitialStates: TVirtualNodeInitStates);
     procedure TreeObjectsGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode; Kind: TVTImageKind;
-      Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: TImageIndex);
+      Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: Integer);
     procedure TreeObjectsInitChildren(Sender: TBaseVirtualTree; Node: PVirtualNode; var ChildCount: Cardinal);
     procedure Execute(Sender: TObject);
     procedure ResultGridInitNode(Sender: TBaseVirtualTree; ParentNode, Node: PVirtualNode;
@@ -701,7 +701,7 @@ begin
 end;
 
 procedure TfrmTableTools.TreeObjectsGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode;
-  Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: TImageIndex);
+  Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: Integer);
 begin
   Mainform.DBtreeGetImageIndex(Sender, Node, Kind, Column, Ghosted, ImageIndex);
 end;
diff --git a/source/usermanager.pas b/source/usermanager.pas
index fc2c8c31..fd1da6a6 100644
--- a/source/usermanager.pas
+++ b/source/usermanager.pas
@@ -128,13 +128,13 @@ type
     procedure listUsersGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex;
       TextType: TVSTTextType; var CellText: string);
     procedure listUsersGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode;
-      Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: TImageIndex);
+      Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: Integer);
     procedure listUsersFocusChanging(Sender: TBaseVirtualTree; OldNode, NewNode: PVirtualNode;
       OldColumn, NewColumn: TColumnIndex; var Allowed: Boolean);
     procedure btnSaveClick(Sender: TObject);
     procedure Modification(Sender: TObject);
     procedure treePrivsGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode;
-      Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: TImageIndex);
+      Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: Integer);
     procedure treePrivsInitNode(Sender: TBaseVirtualTree; ParentNode, Node: PVirtualNode;
       var InitialStates: TVirtualNodeInitStates);
     procedure treePrivsGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex;
@@ -828,7 +828,7 @@ end;
 
 
 procedure TUserManagerForm.listUsersGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode;
-  Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: TImageIndex);
+  Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: Integer);
 var
   User: PUser;
 begin
@@ -983,7 +983,7 @@ end;
 
 
 procedure TUserManagerForm.treePrivsGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode;
-  Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: TImageIndex);
+  Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: Integer);
 begin
   // Icon for privilege
   if Sender.GetNodeLevel(Node) <> 0 then