diff --git a/components/fpexif/fpemakernotecanon.pas b/components/fpexif/fpemakernotecanon.pas
index 9412e8d6e..41cae2db5 100644
--- a/components/fpexif/fpemakernotecanon.pas
+++ b/components/fpexif/fpemakernotecanon.pas
@@ -67,8 +67,10 @@ resourcestring
     '4:Single,5:Continuous,6:Manual focus,16:Pan focus,256:AF+MF,'+
     '512:Movie snap focus,519:Movie servo AF';
   rsCanonGenLkup = '65535:Low,0:Normal,1:High';
+  {
   rsCanonImgStabLkup = '0:Off,1:On,2:Shoot only,3:Panning,4:Dynamic,256:Off,'+
     '257:On,258:Shoot only,259:Panning,260:Dynamic';
+  }
   rsCanonISOLkup = '0:Not used,15:auto,16:50,17:100,18:200,19:400';
   rsCanonMacroLkup = '1:Macro,2:Normal';
   rsCanonMeterLkup = '0:Default,1:Spot,2:Average,3:Evaluative,4:Partial,'+
diff --git a/components/fpexif/fpemakernotecasio.pas b/components/fpexif/fpemakernotecasio.pas
index ad5b32b27..7a9270136 100644
--- a/components/fpexif/fpemakernotecasio.pas
+++ b/components/fpexif/fpemakernotecasio.pas
@@ -20,7 +20,7 @@ type
 implementation
 
 uses
-  fpeStrConsts, fpeUtils, fpeExifData;
+  fpeStrConsts, fpeExifData;
 
 resourcestring
   rsCasioAFMode2Lkup = '0:Off,1:Spot,2:Multi,3:Face detection,4:Tracking,5:Intelligent';
@@ -57,8 +57,10 @@ resourcestring
   rsCasioFlashModeLkup = '1:Auto,2:On,3:Off,4:Red-eye reduction';
   rsCasioFocusingModeLkup = '2:Macro,3:Auto focus,4:Manual focus,5:Infinity';
   rsCasioFocusMode2Lkup = '0:Normal,1:Macro';
+  {
   rsCasioFocusMode22Lkup = '0:Manual,1:Focus lock,2:Macro,3:Single-area auto focus,'+
     '5:Infinity,6:Multi-area auto focus,8:Super macro';
+  }
   rsCasioImageSize2Lkup = '0:640 x 480,4:1600 x 1200,5:2048 x 1536,'+
     '20:2288 x 1712,21:2592 x 1944,22:2304 x 1728,36:3008 x 2008';
   rsCasioImageStabilization2Lkup = '0:Off,1:On,2:Best shot,3:Movie anti-shake';
diff --git a/components/fpexif/fpemakernotenikon.pas b/components/fpexif/fpemakernotenikon.pas
index 8aef61db7..884c7d3c3 100644
--- a/components/fpexif/fpemakernotenikon.pas
+++ b/components/fpexif/fpemakernotenikon.pas
@@ -259,7 +259,6 @@ function TNikonMakerNoteReader.AddTag(AStream: TStream;
   const AIFDRecord: TIFDRecord; const AData: TBytes; AParent: TTagID): Integer;
 var
   tagDef: TTagDef;
-  p: PByte;
   t: TTagID;
   idx: Integer;
   b: Byte;
@@ -327,7 +326,7 @@ begin
           idx := 0;
           AddMakerNoteStringTag(idx, t, 'BarometerInfoVersion', AData, 6);
           inc(idx, 6);
-          Move(AData[idx], r, SizeOf(r));
+          Move(AData[idx], r{%H-}, SizeOf(r));
           r.Numerator := FixEndian32(r.Numerator);
           r.Denominator := FixEndian32(r.Denominator);
           AddMakerNoteTag(idx, t, 'Altitude', r.Numerator/r.Denominator, '', ttSRational);
diff --git a/components/fpexif/fpemakernoteolympus.pas b/components/fpexif/fpemakernoteolympus.pas
index 32145aa3d..0e1e72325 100644
--- a/components/fpexif/fpemakernoteolympus.pas
+++ b/components/fpexif/fpemakernoteolympus.pas
@@ -407,7 +407,6 @@ function TOlympusMakerNoteReader.AddTag(AStream: TStream;
   const AIFDRecord: TIFDRecord; const AData: TBytes; AParent: TTagID): Integer;
 var
   tagDef: TTagDef;
-  p: PByte;
   t: TTagID;
   w: Word;
 begin