diff --git a/components/fpspreadsheet/examples/fpschart/fpschart.lpi b/components/fpspreadsheet/examples/fpschart/fpschart.lpi
index e74f0ba37..94c8fef93 100644
--- a/components/fpspreadsheet/examples/fpschart/fpschart.lpi
+++ b/components/fpspreadsheet/examples/fpschart/fpschart.lpi
@@ -45,7 +45,6 @@
       <Unit0>
         <Filename Value="fpschart.lpr"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="fpschart"/>
       </Unit0>
       <Unit1>
         <Filename Value="mainform.pas"/>
@@ -76,12 +75,6 @@
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerMessages>
-        <UseMsgFile Value="True"/>
-      </CompilerMessages>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
     <Exceptions Count="3">
diff --git a/components/fpspreadsheet/examples/fpschart/mainform.pas b/components/fpspreadsheet/examples/fpschart/mainform.pas
index 78f6c84bf..b6265661f 100644
--- a/components/fpspreadsheet/examples/fpschart/mainform.pas
+++ b/components/fpspreadsheet/examples/fpschart/mainform.pas
@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  StdCtrls, Grids, EditBtn, ExtCtrls, fpspreadsheetchart, fpspreadsheetgrid,
+  StdCtrls, EditBtn, ExtCtrls, fpspreadsheetchart, fpspreadsheetgrid,
   TAGraph, TASeries;
 
 type
diff --git a/components/fpspreadsheet/examples/spready/mainform.pas b/components/fpspreadsheet/examples/spready/mainform.pas
index e4c78be46..ad887cdd2 100644
--- a/components/fpspreadsheet/examples/spready/mainform.pas
+++ b/components/fpspreadsheet/examples/spready/mainform.pas
@@ -655,7 +655,7 @@ end;
 
 procedure TForm1.EdCellAddressEditingDone(Sender: TObject);
 var
-  c, r: integer;
+  c, r: cardinal;
 begin
   if ParseCellString(EdCellAddress.Text, r, c) then begin
     WorksheetGrid.Row := WorksheetGrid.GetGridRow(r);
diff --git a/components/fpspreadsheet/fpspreadsheetchart.pas b/components/fpspreadsheet/fpspreadsheetchart.pas
index 180d3bd12..56da30bf6 100644
--- a/components/fpspreadsheet/fpspreadsheetchart.pas
+++ b/components/fpspreadsheet/fpspreadsheetchart.pas
@@ -38,17 +38,17 @@ type
     FXSelectionDirection: TsSelectionDirection;
     FYSelectionDirection: TsSelectionDirection;
 //    FWorksheetGrid: TsWorksheetGrid;
-    FXFirstCellCol: Integer;
-    FXFirstCellRow: Integer;
-    FYFirstCellCol: Integer;
-    FYFirstCellRow: Integer;
+    FXFirstCellCol: Cardinal;
+    FXFirstCellRow: Cardinal;
+    FYFirstCellCol: Cardinal;
+    FYFirstCellRow: Cardinal;
     procedure SetPointsNumber(const AValue: Integer);
     procedure SetXSelectionDirection(const AValue: TsSelectionDirection);
     procedure SetYSelectionDirection(const AValue: TsSelectionDirection);
-    procedure SetXFirstCellCol(const AValue: Integer);
-    procedure SetXFirstCellRow(const AValue: Integer);
-    procedure SetYFirstCellCol(const AValue: Integer);
-    procedure SetYFirstCellRow(const AValue: Integer);
+    procedure SetXFirstCellCol(const AValue: Cardinal);
+    procedure SetXFirstCellRow(const AValue: Cardinal);
+    procedure SetYFirstCellCol(const AValue: Cardinal);
+    procedure SetYFirstCellRow(const AValue: Cardinal);
   protected
     FDataWorksheet: TsWorksheet;
     FCurItem: TChartDataItem;
@@ -63,10 +63,10 @@ type
   published
 //    property WorksheetGrid: TsWorksheetGrid read FWorksheetGrid write SetWorksheetGrid;
     property PointsNumber: Integer read FPointsNumber write SetPointsNumber default 0;
-    property XFirstCellCol: Integer read FXFirstCellCol write SetXFirstCellCol default 0;
-    property XFirstCellRow: Integer read FXFirstCellRow write SetXFirstCellRow default 0;
-    property YFirstCellCol: Integer read FYFirstCellCol write SetYFirstCellCol default 0;
-    property YFirstCellRow: Integer read FYFirstCellRow write SetYFirstCellRow default 0;
+    property XFirstCellCol: Cardinal read FXFirstCellCol write SetXFirstCellCol default 0;
+    property XFirstCellRow: Cardinal read FXFirstCellRow write SetXFirstCellRow default 0;
+    property YFirstCellCol: Cardinal read FYFirstCellCol write SetYFirstCellCol default 0;
+    property YFirstCellRow: Cardinal read FYFirstCellRow write SetYFirstCellRow default 0;
     property XSelectionDirection: TsSelectionDirection read FXSelectionDirection write SetXSelectionDirection;
     property YSelectionDirection: TsSelectionDirection read FYSelectionDirection write SetYSelectionDirection;
   end;
@@ -108,7 +108,7 @@ begin
   Notify;
 end;
 
-procedure TsWorksheetChartSource.SetXFirstCellCol(const AValue: Integer);
+procedure TsWorksheetChartSource.SetXFirstCellCol(const AValue: Cardinal);
 begin
   if FXFirstCellCol=AValue then exit;
   FXFirstCellCol:=AValue;
@@ -116,7 +116,7 @@ begin
   Notify;
 end;
 
-procedure TsWorksheetChartSource.SetXFirstCellRow(const AValue: Integer);
+procedure TsWorksheetChartSource.SetXFirstCellRow(const AValue: Cardinal);
 begin
   if FXFirstCellRow=AValue then exit;
   FXFirstCellRow:=AValue;
@@ -124,7 +124,7 @@ begin
   Notify;
 end;
 
-procedure TsWorksheetChartSource.SetYFirstCellCol(const AValue: Integer);
+procedure TsWorksheetChartSource.SetYFirstCellCol(const AValue: Cardinal);
 begin
   if FYFirstCellCol=AValue then exit;
   FYFirstCellCol:=AValue;
@@ -132,7 +132,7 @@ begin
   Notify;
 end;
 
-procedure TsWorksheetChartSource.SetYFirstCellRow(const AValue: Integer);
+procedure TsWorksheetChartSource.SetYFirstCellRow(const AValue: Cardinal);
 begin
   if FYFirstCellRow=AValue then exit;
   FYFirstCellRow:=AValue;
@@ -208,7 +208,7 @@ end;
 procedure TsWorksheetChartSource.LoadPropertiesFromStrings(AXInterval,
   AYInterval, AXTitle, AYTitle, ATitle: string);
 var
-  lXCount, lYCount: Integer;
+  lXCount, lYCount: Cardinal;
 begin
   Unused(AXTitle, AYTitle, ATitle);
   ParseIntervalString(AXInterval, FXFirstCellRow, FXFirstCellCol, lXCount, FXSelectionDirection);
diff --git a/components/fpspreadsheet/xlsbiff2.pas b/components/fpspreadsheet/xlsbiff2.pas
index 167caae60..d4035cad0 100755
--- a/components/fpspreadsheet/xlsbiff2.pas
+++ b/components/fpspreadsheet/xlsbiff2.pas
@@ -869,6 +869,7 @@ procedure TsSpreadBIFF2Writer.WriteCellFormatting(AStream: TStream; ACell: PCell
   XFIndex: Word);
 var
   b: Byte;
+  w: Word;
 begin
   if ACell^.UsedFormattingFields = [] then
   begin
@@ -887,7 +888,9 @@ begin
   // 2nd byte:
   //   Mask $3F: Index to FORMAT record
   //   Mask $C0: Index to FONT record
-  b := ACell.FontIndex shl 6;
+  w := ACell.FontIndex shl 6;
+  b := Lo(w);
+  //b := ACell.FontIndex shl 6;
   AStream.WriteByte(b);
 
   // 3rd byte