diff --git a/packages/delphi10/heidisql.bdsproj b/packages/delphi10/heidisql.bdsproj
index a262eb63..b0bbed5d 100644
--- a/packages/delphi10/heidisql.bdsproj
+++ b/packages/delphi10/heidisql.bdsproj
@@ -48,9 +48,9 @@
 			<Compiler Name="NamespacePrefix"></Compiler>
 			<Compiler Name="GenerateDocumentation">False</Compiler>
 			<Compiler Name="DefaultNamespace"></Compiler>
-			<Compiler Name="SymbolDeprecated">False</Compiler>
+			<Compiler Name="SymbolDeprecated">True</Compiler>
 			<Compiler Name="SymbolLibrary">True</Compiler>
-			<Compiler Name="SymbolPlatform">False</Compiler>
+			<Compiler Name="SymbolPlatform">True</Compiler>
 			<Compiler Name="SymbolExperimental">True</Compiler>
 			<Compiler Name="UnitLibrary">True</Compiler>
 			<Compiler Name="UnitPlatform">True</Compiler>
@@ -85,7 +85,7 @@
 			<Compiler Name="HPPEMITIgnored">True</Compiler>
 			<Compiler Name="NoRetVal">True</Compiler>
 			<Compiler Name="UseBeforeDef">True</Compiler>
-			<Compiler Name="ForLoopVarUndef">False</Compiler>
+			<Compiler Name="ForLoopVarUndef">True</Compiler>
 			<Compiler Name="UnitNameMismatch">True</Compiler>
 			<Compiler Name="NoCFGFileFound">True</Compiler>
 			<Compiler Name="ImplicitVariants">True</Compiler>
diff --git a/packages/delphi11/heidisql.dproj b/packages/delphi11/heidisql.dproj
index 9016dd71..18337ded 100644
--- a/packages/delphi11/heidisql.dproj
+++ b/packages/delphi11/heidisql.dproj
@@ -24,9 +24,6 @@
     <DCC_ObjPath>..\..\components\compilerdetection\include;..\..\components\heidisql\include;..\..\components\edbimage\build;..\..\components\heidisql\build;..\..\components\smdbgrid\build;..\..\components\smdbgrid\resources;..\..\components\synedit\build;..\..\components\synedit\resources;..\..\components\zeosdbo\build;..\..\components\virtualtreeview\build;..\..\components\virtualtreeview\Resources</DCC_ObjPath>
     <DCC_IncludePath>..\..\components\compilerdetection\include;..\..\components\heidisql\include;..\..\components\edbimage\build;..\..\components\heidisql\build;..\..\components\smdbgrid\build;..\..\components\smdbgrid\resources;..\..\components\synedit\build;..\..\components\synedit\resources;..\..\components\zeosdbo\build;..\..\components\virtualtreeview\build;..\..\components\virtualtreeview\Resources</DCC_IncludePath>
     <DCC_Define>RELEASE</DCC_Define>
-    <DCC_SYMBOL_DEPRECATED>False</DCC_SYMBOL_DEPRECATED>
-    <DCC_SYMBOL_PLATFORM>False</DCC_SYMBOL_PLATFORM>
-    <DCC_FOR_LOOP_VAR_UNDEF>False</DCC_FOR_LOOP_VAR_UNDEF>
     <DCC_Description>HeidiSQL</DCC_Description>
     <DCC_AssertionsAtRuntime>False</DCC_AssertionsAtRuntime>
   </PropertyGroup>
@@ -48,9 +45,6 @@
     <DCC_ObjPath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;..\..\components\compilerdetection\include;..\..\components\heidisql\include;..\..\components\edbimage\build;..\..\components\heidisql\build;..\..\components\smdbgrid\build;..\..\components\smdbgrid\resources;..\..\components\synedit\build;..\..\components\synedit\resources;..\..\components\zeosdbo\build;..\..\components\virtualtreeview\build;..\..\components\virtualtreeview\resources</DCC_ObjPath>
     <DCC_IncludePath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;..\..\components\compilerdetection\include;..\..\components\heidisql\include;..\..\components\edbimage\build;..\..\components\heidisql\build;..\..\components\smdbgrid\build;..\..\components\smdbgrid\resources;..\..\components\synedit\build;..\..\components\synedit\resources;..\..\components\zeosdbo\build;..\..\components\virtualtreeview\build;..\..\components\virtualtreeview\resources</DCC_IncludePath>
     <DCC_Define>DEBUG</DCC_Define>
-    <DCC_SYMBOL_DEPRECATED>False</DCC_SYMBOL_DEPRECATED>
-    <DCC_SYMBOL_PLATFORM>False</DCC_SYMBOL_PLATFORM>
-    <DCC_FOR_LOOP_VAR_UNDEF>False</DCC_FOR_LOOP_VAR_UNDEF>
     <DCC_Description>HeidiSQL</DCC_Description>
   </PropertyGroup>
   <ProjectExtensions>
diff --git a/source/about.pas b/source/about.pas
index 5a1769f1..ba234ab0 100644
--- a/source/about.pas
+++ b/source/about.pas
@@ -91,7 +91,7 @@ end;
 
 procedure TAboutBox.FormShow(Sender: TObject);
 var
-  CompiledInt    : Integer;
+//  CompiledInt    : Integer;
   Compiled       : TDateTime;
 begin
   // Define the current cursor like a clock
@@ -101,8 +101,7 @@ begin
   LabelVersion.Caption := 'Version ' + appversion;
 
   // Compile-date
-  CompiledInt := Fileage( ParamStr( 0 ) );
-  Compiled := FileDateToDateTime( CompiledInt );
+  FileAge(ParamStr(0), Compiled);
   LabelCompiled.Caption := 'Compiled on: ' + DateTimeToStr( Compiled );
 
   // Define the current cursor like a pointer (default)
diff --git a/source/insertfiles.pas b/source/insertfiles.pas
index 5f495229..f75cfd0d 100644
--- a/source/insertfiles.pas
+++ b/source/insertfiles.pas
@@ -198,12 +198,10 @@ end;
 procedure TfrmInsertFiles.addfile(filename: String);
 var
   li : TListItem;
-  filesize, attrs: Integer;
+  filesize: Integer;
   Info    : TSHFileInfo;
 begin
-  attrs := filegetattr(filename);
-  if attrs and faDirectory <> 0 then
-    exit;
+  if DirectoryExists(filename) then Exit;
   li := ListViewFiles.Items.Add;
   li.Caption := filename;
   filesize := ceil(_getfilesize(filename) / 1024);
diff --git a/source/insertfiles_progress.pas b/source/insertfiles_progress.pas
index a6d2efe4..22f422b9 100644
--- a/source/insertfiles_progress.pas
+++ b/source/insertfiles_progress.pas
@@ -52,11 +52,12 @@ procedure TfrmInsertFilesProgress.ProcessFiles(Sender: TObject);
   end;
 
 var
-  i,j: Integer;
-  value, filename : String;
-  y,m,d,h,mi,s,ms : Word;
-  FileStream : TFileStream;
-  zq : TDeferDataSet;
+  i, j: Integer;
+  value, filename: String;
+  dt: TDateTime;
+  y, m, d, h, mi, s, ms: Word;
+  FileStream: TFileStream;
+  zq: TDeferDataSet;
 begin
   Timer1.Enabled := false;
   screen.Cursor := crHourglass;
@@ -100,8 +101,9 @@ begin
           //Value := stringreplace(Value, '%filesize%', inttostr(size), [rfReplaceAll]);
           Value := stringreplace(Value, '%filename%', ExtractFileName(filename), [rfReplaceAll]);
           Value := stringreplace(Value, '%filepath%', ExtractFilePath(filename), [rfReplaceAll]);
-          DecodeDate(FileDateToDateTime(FileAge(filename)), y, m, d);
-          DecodeTime(FileDateToDateTime(FileAge(filename)), h, mi, s, ms);
+          FileAge(filename, dt);
+          DecodeDate(dt, y, m, d);
+          DecodeTime(dt, h, mi, s, ms);
           Value := stringreplace(Value, '%filedate%', Format('%.4d-%.2d-%.2d', [y,m,d]), [rfReplaceAll]);
           Value := stringreplace(Value, '%filedatetime%', Format('%.4d-%.2d-%.2d %.2d:%.2d:%.2d', [y,m,d,h,mi,s]), [rfReplaceAll]);
           Value := stringreplace(Value, '%filetime%', Format('%.2d:%.2d:%.2d', [h,mi,s]), [rfReplaceAll]);