diff --git a/components/fpspreadsheet/examples/other/test_write_formatting.lpi b/components/fpspreadsheet/examples/other/test_write_formatting.lpi
index 72184c16b..afb61fea1 100644
--- a/components/fpspreadsheet/examples/other/test_write_formatting.lpi
+++ b/components/fpspreadsheet/examples/other/test_write_formatting.lpi
@@ -13,7 +13,6 @@
       <Title Value="test_write_formatting"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
-      <Icon Value="0"/>
     </General>
     <i18n>
       <EnableI18N LFM="False"/>
diff --git a/components/fpspreadsheet/examples/other/test_write_formatting.pas b/components/fpspreadsheet/examples/other/test_write_formatting.pas
index 95deca231..144937c77 100644
--- a/components/fpspreadsheet/examples/other/test_write_formatting.pas
+++ b/components/fpspreadsheet/examples/other/test_write_formatting.pas
@@ -170,8 +170,8 @@ begin
   WriteSecondWorksheet();
 
   // Save the spreadsheet to a file
-  //MyWorkbook.WriteToFile(MyDir + 'test3.xls', sfExcel8, False);
-  MyWorkbook.WriteToFile(MyDir + 'test3.odt', sfOpenDocument, False);
+  MyWorkbook.WriteToFile(MyDir + 'test3.xls', sfExcel8, False);
+//  MyWorkbook.WriteToFile(MyDir + 'test3.odt', sfOpenDocument, False);
   MyWorkbook.Free;
 end.
 
diff --git a/components/fpspreadsheet/laz_fpspreadsheet.lpk b/components/fpspreadsheet/laz_fpspreadsheet.lpk
index 1596b4e88..b88409323 100644
--- a/components/fpspreadsheet/laz_fpspreadsheet.lpk
+++ b/components/fpspreadsheet/laz_fpspreadsheet.lpk
@@ -14,7 +14,15 @@
           <UseAnsiStrings Value="False"/>
         </SyntaxOptions>
       </Parsing>
+      <Linking>
+        <Debugging>
+          <GenerateDebugInfo Value="True"/>
+        </Debugging>
+      </Linking>
       <Other>
+        <CompilerMessages>
+          <UseMsgFile Value="True"/>
+        </CompilerMessages>
         <CompilerPath Value="$(CompPath)"/>
       </Other>
     </CompilerOptions>
diff --git a/components/fpspreadsheet/xlscommon.pas b/components/fpspreadsheet/xlscommon.pas
index e6402047b..d5e10b248 100644
--- a/components/fpspreadsheet/xlscommon.pas
+++ b/components/fpspreadsheet/xlscommon.pas
@@ -71,7 +71,8 @@ type
 
   TsSpreadBIFFWriter = class(TsCustomSpreadWriter)
   protected
-    FLastRow, FLastCol: Integer;
+    FLastRow: Integer;
+    FLastCol: Word;
     function FPSColorToEXCELPallete(AColor: TsColor): Word;
     procedure GetLastRowCallback(ACell: PCell; AStream: TStream);
     function GetLastRowIndex(AWorksheet: TsWorksheet): Integer;
@@ -115,6 +116,7 @@ function TsSpreadBIFFWriter.GetLastRowIndex(AWorksheet: TsWorksheet): Integer;
 begin
   FLastRow := 0;
   IterateThroughCells(nil, AWorksheet.Cells, GetLastRowCallback);
+  Result := FLastRow;
 end;
 
 procedure TsSpreadBIFFWriter.GetLastColCallback(ACell: PCell; AStream: TStream);
@@ -126,6 +128,7 @@ function TsSpreadBIFFWriter.GetLastColIndex(AWorksheet: TsWorksheet): Word;
 begin
   FLastCol := 0;
   IterateThroughCells(nil, AWorksheet.Cells, GetLastColCallback);
+  Result := FLastCol;
 end;
 
 end.