diff --git a/components/fpexif/fpeexifreadwrite.pas b/components/fpexif/fpeexifreadwrite.pas
index 7d501af12..c5165b2f6 100644
--- a/components/fpexif/fpeexifreadwrite.pas
+++ b/components/fpexif/fpeexifreadwrite.pas
@@ -309,7 +309,11 @@ var
   i: Integer;
   ifdRec: TIFDRecord;
   byteCount: Integer;
+  {$IFDEF FPC}
   data: TBytes = nil;
+  {$ELSE}
+  data: TBytes;
+  {$ENDIF}
   n: Int64;
   tagPos: Int64;
   newPos: Int64;
diff --git a/components/fpexif/fpemetadata.pas b/components/fpexif/fpemetadata.pas
index 143ae923f..16e4554ef 100644
--- a/components/fpexif/fpemetadata.pas
+++ b/components/fpexif/fpemetadata.pas
@@ -423,7 +423,7 @@ begin
     // Some images do not specify the segment length correctly and fill the
     // space to the next segment with zero bytes.
     if (header.Key = 0) then begin
-      repeat until AInputStream.ReadByte = $FF;
+      repeat until ReadByte(AInputStream) = $FF;
       AInputStream.Position := AInputStream.Position - 1;
       n := AInputStream.Read(header, SizeOf(Header));
       if n <> SizeOf(Header) then
diff --git a/components/fpexif/fpeutils.pas b/components/fpexif/fpeutils.pas
index 695672cd2..61a6ed7d0 100644
--- a/components/fpexif/fpeutils.pas
+++ b/components/fpexif/fpeutils.pas
@@ -1,4 +1,4 @@
-unit fpeUtils;
+unit fpeUtils;
 
 {$IFDEF FPC}
   {$mode ObjFPC}{$H+}
diff --git a/components/fpexif/tests/unittest/fpExifTests.lpi b/components/fpexif/tests/unittest/fpExifTests.lpi
index 5a3c429d1..b5eacae73 100644
--- a/components/fpexif/tests/unittest/fpExifTests.lpi
+++ b/components/fpexif/tests/unittest/fpExifTests.lpi
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="12"/>
     <PathDelim Value="\"/>
     <General>
+      <Flags>
+        <CompatibilityMode Value="True"/>
+      </Flags>
       <SessionStorage Value="InProjectDir"/>
-      <MainUnit Value="0"/>
       <Title Value="fpExifTests"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
@@ -18,9 +20,10 @@
       <Version Value="2"/>
     </PublishOptions>
     <RunParams>
-      <local>
-        <FormatVersion Value="1"/>
-      </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default"/>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="3">
       <Item1>
@@ -135,7 +138,7 @@
     </SearchPaths>
     <Linking>
       <Debugging>
-        <UseExternalDbgSyms Value="True"/>
+        <DebugInfoType Value="dsDwarf2Set"/>
       </Debugging>
       <Options>
         <Win32>
diff --git a/components/fpexif/tests/unittest/fpExifTests_Delphi.dproj b/components/fpexif/tests/unittest/fpExifTests_Delphi.dproj
index 2e732207f..ee8f2b5ee 100644
--- a/components/fpexif/tests/unittest/fpExifTests_Delphi.dproj
+++ b/components/fpexif/tests/unittest/fpExifTests_Delphi.dproj
@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>18.2</ProjectVersion>
+        <ProjectVersion>18.8</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
@@ -78,7 +78,7 @@
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
-        <AppEnableHighDPI>true</AppEnableHighDPI>
+        <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2)'!=''">
         <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
@@ -87,11 +87,12 @@
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
-        <AppEnableHighDPI>true</AppEnableHighDPI>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_MajorVer>1</VerInfo_MajorVer>
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
         <Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
+        <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
+        <BT_BuildType>Debug</BT_BuildType>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -106,7 +107,7 @@
         <DCCReference Include="..\..\fpemetadata.pas"/>
         <DCCReference Include="..\..\fpestrconsts.pas"/>
         <DCCReference Include="..\..\fpetags.pas"/>
-        <DCCReference Include="..\..\fpeUtils.pas"/>
+        <DCCReference Include="..\..\fpeutils.pas"/>
         <DCCReference Include="common\fetexifbe.pas"/>
         <DCCReference Include="common\fetexifle.pas"/>
         <DCCReference Include="common\fetiptc.pas"/>