diff --git a/components/fpspreadsheet/fpspreadsheet.pas b/components/fpspreadsheet/fpspreadsheet.pas
index 0042be192..7f66ed716 100755
--- a/components/fpspreadsheet/fpspreadsheet.pas
+++ b/components/fpspreadsheet/fpspreadsheet.pas
@@ -6426,14 +6426,12 @@ end;
 constructor TsWorkbook.Create;
 var
   fmt: TsCellFormat;
-  cp: String;
 begin
   inherited Create;
   FWorksheets := TFPList.Create;
   FLog := TStringList.Create;
   FFormat := sfExcel8;
   FCodePage := GetDefaultTextEncoding;
-//  FEncoding := seLatin1;
 
   FormatSettings := UTF8FormatSettings;
   FormatSettings.ShortDateFormat := MakeShortDateFormat(FormatSettings.ShortDateFormat);
diff --git a/components/fpspreadsheet/laz_fpspreadsheet.lpk b/components/fpspreadsheet/laz_fpspreadsheet.lpk
index 7c2b2e5d6..cffa1c5e4 100644
--- a/components/fpspreadsheet/laz_fpspreadsheet.lpk
+++ b/components/fpspreadsheet/laz_fpspreadsheet.lpk
@@ -18,7 +18,7 @@
       </Parsing>
       <Other>
         <CompilerMessages>
-          <IgnoredMessages idx4055="True"/>
+          <IgnoredMessages idx5028="True" idx4055="True"/>
         </CompilerMessages>
         <CustomOptions Value="$(IDEBuildOptions)"/>
       </Other>
diff --git a/components/fpspreadsheet/laz_fpspreadsheet_visual.lpk b/components/fpspreadsheet/laz_fpspreadsheet_visual.lpk
index fae3683e8..1dfb385d7 100644
--- a/components/fpspreadsheet/laz_fpspreadsheet_visual.lpk
+++ b/components/fpspreadsheet/laz_fpspreadsheet_visual.lpk
@@ -52,6 +52,8 @@ It provides graphical components like a grid and chart."/>
       </Item1>
       <Item2>
         <PackageName Value="laz_fpspreadsheet"/>
+        <MaxVersion Major="1" Minor="5"/>
+        <MinVersion Major="1" Minor="5"/>
       </Item2>
       <Item3>
         <PackageName Value="LCL"/>
diff --git a/components/fpspreadsheet/laz_fpspreadsheetexport_visual.lpk b/components/fpspreadsheet/laz_fpspreadsheetexport_visual.lpk
index d34275ba9..20f0c8620 100644
--- a/components/fpspreadsheet/laz_fpspreadsheetexport_visual.lpk
+++ b/components/fpspreadsheet/laz_fpspreadsheetexport_visual.lpk
@@ -42,6 +42,8 @@ It provides a graphical export component on the Data Export tab."/>
       </Item1>
       <Item2>
         <PackageName Value="laz_fpspreadsheet"/>
+        <MaxVersion Major="1" Minor="5"/>
+        <MinVersion Major="1" Minor="5"/>
       </Item2>
       <Item3>
         <PackageName Value="LCL"/>
diff --git a/components/fpspreadsheet/xlsbiff8.pas b/components/fpspreadsheet/xlsbiff8.pas
index 573153316..df8c701d1 100755
--- a/components/fpspreadsheet/xlsbiff8.pas
+++ b/components/fpspreadsheet/xlsbiff8.pas
@@ -239,23 +239,23 @@ const
 
    { Excel OBJ subrecord IDs }
      INT_EXCEL_OBJID_FTEND               = $0000;
-     INT_EXCEL_OBJID_FTMACRO             = $0004;
-     INT_EXCEL_OBJID_FTBUTTON            = $0005;
-     INT_EXCEL_OBJID_FTGMO               = $0006;  // Group marker
-     INT_EXCEL_OBJID_CF                  = $0007;  // Clipboard format
-     INT_EXCEL_OBJID_PIOGRBIT            = $0008;  // Picture option flags
-     INT_EXCEL_OBJID_PICTFMLA            = $0009;  // Picture fmla-style macro
-     INT_EXCEL_OBJID_FTCBLS              = $000A;  // Checkbox link
-     INT_EXCEL_OBJID_FTRBO               = $000B;  // Radio button
-     INT_EXCEL_OBJID_FTSBS               = $000C;  // Scrollbar
-     INT_EXCEL_OBJID_FTNTS               = $000D;  // Notes structure (= Comment)
-     INT_EXCEL_OBJID_FTSBSFMLA           = $000E;  // Scroll bar fmla-style macro
-     INT_EXCEL_OBJID_FTGBODATA           = $000F;  // Group box data
-     INT_EXCEL_OBJID_FTEDODATA           = $0010;  // Edit control data
-     INT_EXCEL_OBJID_FTRBODATA           = $0011;  // Radio button data
-     INT_EXCEL_OBJID_FTCBLSDATA          = $0012;  // Check box data
-     INT_EXCEL_OBJID_FTLBSDATA           = $0013;  // List box data
-     INT_EXCEL_OBJID_FTCBLSFMLA          = $0014;  // Check box link fmla-style macro
+{%H-}INT_EXCEL_OBJID_FTMACRO             = $0004;
+{%H-}INT_EXCEL_OBJID_FTBUTTON            = $0005;
+{%H-}INT_EXCEL_OBJID_FTGMO               = $0006;  // Group marker
+{%H-}INT_EXCEL_OBJID_CF                  = $0007;  // Clipboard format
+{%H-}INT_EXCEL_OBJID_PIOGRBIT            = $0008;  // Picture option flags
+{%H-}INT_EXCEL_OBJID_PICTFMLA            = $0009;  // Picture fmla-style macro
+{%H-}INT_EXCEL_OBJID_FTCBLS              = $000A;  // Checkbox link
+{%H-}INT_EXCEL_OBJID_FTRBO               = $000B;  // Radio button
+{%H-}INT_EXCEL_OBJID_FTSBS               = $000C;  // Scrollbar
+{%H-}INT_EXCEL_OBJID_FTNTS               = $000D;  // Notes structure (= Comment)
+{%H-}INT_EXCEL_OBJID_FTSBSFMLA           = $000E;  // Scroll bar fmla-style macro
+{%H-}INT_EXCEL_OBJID_FTGBODATA           = $000F;  // Group box data
+{%H-}INT_EXCEL_OBJID_FTEDODATA           = $0010;  // Edit control data
+{%H-}INT_EXCEL_OBJID_FTRBODATA           = $0011;  // Radio button data
+{%H-}INT_EXCEL_OBJID_FTCBLSDATA          = $0012;  // Check box data
+{%H-}INT_EXCEL_OBJID_FTLBSDATA           = $0013;  // List box data
+{%H-}INT_EXCEL_OBJID_FTCBLSFMLA          = $0014;  // Check box link fmla-style macro
      INT_EXCEL_OBJID_FTCMO               = $0015;  // Common object data
 
    { Cell Addresses constants }
@@ -401,7 +401,6 @@ var
   r, c: Word;
   commentID: Word;
   commentText: String;
-  comment: TBIFF8Comment;
   i: Integer;
 begin
   { Row of the comment }
diff --git a/components/fpspreadsheet/xlsxooxml.pas b/components/fpspreadsheet/xlsxooxml.pas
index 8d8965d2f..44cae96ce 100755
--- a/components/fpspreadsheet/xlsxooxml.pas
+++ b/components/fpspreadsheet/xlsxooxml.pas
@@ -455,12 +455,10 @@ end;
 
 function TsSpreadOOXMLReader.FindCommentsFileName(ANode: TDOMNode): String;
 var
-  nodeName: String;
   s: String;
 begin
   while ANode <> nil do
   begin
-    nodeName := ANode.NodeName;
     s := GetAttrValue(ANode, 'Type');
     if s = SCHEMAS_COMMENTS then
     begin