diff --git a/components/fpspreadsheet/examples/excel2demo/excel2read.lpr b/components/fpspreadsheet/examples/excel2demo/excel2read.lpr
index fd56de91d..b07c3e8b1 100644
--- a/components/fpspreadsheet/examples/excel2demo/excel2read.lpr
+++ b/components/fpspreadsheet/examples/excel2demo/excel2read.lpr
@@ -23,6 +23,11 @@ begin
   // Open the input file
   MyDir := ExtractFilePath(ParamStr(0));
   InputFileName := MyDir + 'test' + STR_EXCEL_EXTENSION;
+  if not FileExists(InputFileName) then begin
+    WriteLn('Input file ', InputFileName, ' does not exist. Please run excel2write first.');
+    Halt;
+  end;
+
   WriteLn('Opening input file ', InputFilename);
 
   // Create the spreadsheet
diff --git a/components/fpspreadsheet/examples/excel2demo/excel2write.lpr b/components/fpspreadsheet/examples/excel2demo/excel2write.lpr
index fd8a0da32..92e97b4af 100644
--- a/components/fpspreadsheet/examples/excel2demo/excel2write.lpr
+++ b/components/fpspreadsheet/examples/excel2demo/excel2write.lpr
@@ -45,8 +45,6 @@ begin
 }
 
   // Write some number cells
-  MyWorksheet.WriteNumber(0, 0, 0.0, nfFixed, 2);
-  (*
   MyWorksheet.WriteNumber(0, 0, 1.0);
   MyWorksheet.WriteUsedFormatting(0, 0, [uffBold, uffNumberFormat]);
   MyWorksheet.WriteNumber(0, 1, 2.0);
@@ -380,7 +378,7 @@ begin
   MyWorksheet.WriteRowInfo(5, lRow);
   lRow.Height := 2;                    // 2 lines
   MyWorksheet.WriteRowInfo(6, lRow);
-                                    *)
+
   // Save the spreadsheet to a file
   MyWorkbook.WriteToFile(MyDir + 'test' + STR_EXCEL_EXTENSION, sfExcel2, true);
   MyWorkbook.Free;
diff --git a/components/fpspreadsheet/examples/excel5demo/excel5read.lpr b/components/fpspreadsheet/examples/excel5demo/excel5read.lpr
index 61cfcdfda..ec967b69e 100644
--- a/components/fpspreadsheet/examples/excel5demo/excel5read.lpr
+++ b/components/fpspreadsheet/examples/excel5demo/excel5read.lpr
@@ -24,6 +24,10 @@ begin
   // Open the input file
   MyDir := ExtractFilePath(ParamStr(0));
   InputFileName := MyDir + 'test.xls';
+  if not FileExists(InputFileName) then begin
+    WriteLn('Input file ', InputFileName, ' does not exist. Please run excel5write first.');
+    Halt;
+  end;
   WriteLn('Opening input file ', InputFilename);
 
   // Create the spreadsheet
diff --git a/components/fpspreadsheet/examples/excel5demo/excel5write.lpr b/components/fpspreadsheet/examples/excel5demo/excel5write.lpr
index 7b83e2b9f..fe6d1e1e0 100644
--- a/components/fpspreadsheet/examples/excel5demo/excel5write.lpr
+++ b/components/fpspreadsheet/examples/excel5demo/excel5write.lpr
@@ -175,11 +175,11 @@ begin
   MyWorksheet.WriteUTF8Text(r, 0, 'nfShortDateTime');
   MyWorksheet.WriteDateTime(r, 1, now, nfShortDateTime);
   inc(r);
-  MyWorksheet.WriteUTF8Text(r, 0, 'nfFmtDateTime, DM');
-  MyWorksheet.WriteDateTime(r, 1, now, nfFmtDateTime, 'DM');
+  MyWorksheet.WriteUTF8Text(r, 0, 'nfCustom, dd/mmm');
+  MyWorksheet.WriteDateTime(r, 1, now, nfCustom, 'dd/mmm');
   inc(r);
-  MyWorksheet.WriteUTF8Text(r, 0, 'nfFmtDateTime, MY');
-  MyWorksheet.WriteDateTime(r, 1, now, nfFmtDateTime, 'MY');
+  MyWorksheet.WriteUTF8Text(r, 0, 'nfCustom, mmm/yy');
+  MyWorksheet.WriteDateTime(r, 1, now, nfCustom, 'mmm/yy');
   inc(r);
   MyWorksheet.WriteUTF8Text(r, 0, 'nfShortTimeAM');
   MyWorksheet.WriteDateTime(r, 1, now, nfShortTimeAM);
@@ -187,14 +187,14 @@ begin
   MyWorksheet.WriteUTF8Text(r, 0, 'nfLongTimeAM');
   MyWorksheet.WriteDateTime(r, 1, now, nfLongTimeAM);
   inc(r);
-  MyWorksheet.WriteUTF8Text(r, 0, 'nfFmtDateTime, MS');
-  MyWorksheet.WriteDateTime(r, 1, now, nfFmtDateTime, 'MS');
+  MyWorksheet.WriteUTF8Text(r, 0, 'nfCustom, nn:ss');
+  MyWorksheet.WriteDateTime(r, 1, now, nfCustom, 'nn:ss');
   inc(r);
-  MyWorksheet.WriteUTF8Text(r, 0, 'nfFmtDateTime, MSZ');
-  MyWorksheet.WriteDateTime(r, 1, now, nfFmtDateTime, 'MSZ');
+  MyWorksheet.WriteUTF8Text(r, 0, 'nfCustom, nn:ss.z');
+  MyWorksheet.WriteDateTime(r, 1, now, nfCustom, 'nn:ss.z');
   inc(r);
-  MyWorksheet.WriteUTF8Text(r, 0, 'nfFmtDateTime, mm:ss.zzz');
-  MyWorksheet.WriteDateTime(r, 1, now, nfFmtDateTime, 'mm:ss.zzz');
+  MyWorksheet.WriteUTF8Text(r, 0, 'nfCustom, nn:ss.zzz');
+  MyWorksheet.WriteDateTime(r, 1, now, nfCustom, 'nn:ss.zzz');
 
   // Write formatted numbers
   number := 12345.67890123456789;
@@ -276,24 +276,24 @@ begin
 
   inc(r,2);
   MyWorksheet.WriteUTF8Text(r, 0, 'nfCurrency, 0 decs');
-  MyWorksheet.WriteNumber(r, 1, number, nfCurrency, 0, 'USD');
-  MyWorksheet.WriteNumber(r, 2, -number, nfCurrency, 0, 'USD');
-  MyWorksheet.WriteNumber(r, 3, 0.0, nfCurrency, 0, 'USD');
+  MyWorksheet.WriteCurrency(r, 1, number, nfCurrency, 0, 'USD');
+  MyWorksheet.WriteCurrency(r, 2, -number, nfCurrency, 0, 'USD');
+  MyWorksheet.WriteCurrency(r, 3, 0.0, nfCurrency, 0, 'USD');
   inc(r);
   MyWorksheet.WriteUTF8Text(r, 0, 'nfCurrencyRed, 0 decs');
-  MyWorksheet.WriteNumber(r, 1, number, nfCurrencyRed, 0, 'USD');
-  MyWorksheet.WriteNumber(r, 2, -number, nfCurrencyRed, 0, 'USD');
-  MyWorksheet.WriteNumber(r, 3, 0.0, nfCurrencyRed, 0, 'USD');
+  MyWorksheet.WriteCurrency(r, 1, number, nfCurrencyRed, 0, 'USD');
+  MyWorksheet.WriteCurrency(r, 2, -number, nfCurrencyRed, 0, 'USD');
+  MyWorksheet.WriteCurrency(r, 3, 0.0, nfCurrencyRed, 0, 'USD');
   inc(r);
   MyWorksheet.WriteUTF8Text(r, 0, 'nfAccounting, 0 decs');
-  MyWorksheet.WriteNumber(r, 1, number, nfAccounting, 0, 'USD');
-  MyWorksheet.WriteNumber(r, 2, -number, nfAccounting, 0, 'USD');
-  MyWorksheet.WriteNumber(r, 3, 0.0, nfAccounting, 0, 'USD');
+  MyWorksheet.WriteCurrency(r, 1, number, nfAccounting, 0, 'USD');
+  MyWorksheet.WriteCurrency(r, 2, -number, nfAccounting, 0, 'USD');
+  MyWorksheet.WriteCurrency(r, 3, 0.0, nfAccounting, 0, 'USD');
   inc(r);
   MyWorksheet.WriteUTF8Text(r, 0, 'nfAccountingRed, 0 decs');
-  MyWorksheet.WriteNumber(r, 1, number, nfAccountingRed, 0, 'USD');
-  MyWorksheet.WriteNumber(r, 2, -number, nfAccountingRed, 0, 'USD');
-  MyWorksheet.WriteNumber(r, 3, 0.0, nfAccountingRed, 0, 'USD');
+  MyWorksheet.WriteCurrency(r, 1, number, nfAccountingRed, 0, 'USD');
+  MyWorksheet.WriteCurrency(r, 2, -number, nfAccountingRed, 0, 'USD');
+  MyWorksheet.WriteCurrency(r, 3, 0.0, nfAccountingRed, 0, 'USD');
 
   inc(r, 2);
   MyWorksheet.WriteUTF8Text(r, 0, 'nfCustom, "$"#,##0_);("$"#,##0)');
diff --git a/components/fpspreadsheet/examples/excel8demo/excel8read.lpr b/components/fpspreadsheet/examples/excel8demo/excel8read.lpr
index 3bc56b765..d8d88415f 100644
--- a/components/fpspreadsheet/examples/excel8demo/excel8read.lpr
+++ b/components/fpspreadsheet/examples/excel8demo/excel8read.lpr
@@ -27,6 +27,11 @@ begin
   // Open the input file
   MyDir := ExtractFilePath(ParamStr(0));
   InputFileName := MyDir + 'test.xls';
+
+  if not FileExists(InputFileName) then begin
+    WriteLn('Input file ', InputFileName, ' does not exist. Please run excel8write first.');
+    Halt;
+  end;
   WriteLn('Opening input file ', InputFilename);
 
   // Create the spreadsheet
diff --git a/components/fpspreadsheet/examples/excel8demo/excel8write.lpr b/components/fpspreadsheet/examples/excel8demo/excel8write.lpr
index 4752ff44b..49dfbae0f 100644
--- a/components/fpspreadsheet/examples/excel8demo/excel8write.lpr
+++ b/components/fpspreadsheet/examples/excel8demo/excel8write.lpr
@@ -46,7 +46,6 @@ begin
   MyWorksheet.Options := MyWorksheet.Options - [soShowGridLines];
 
   number := 10000;
-  (*
   {
   MyWorksheet.Options := MyWorksheet.Options + [soHasFrozenPanes];
   myWorksheet.LeftPaneWidth := 1;
@@ -310,12 +309,12 @@ begin
   MyWorksheet.WriteCurrency(r, 1, number, nfCurrency, 0, 'USD');
   MyWorksheet.WriteCurrency(r, 2, -number, nfCurrency, 0, 'USD');
   MyWorksheet.WriteCurrency(r, 3, 0.0, nfCurrency, 0, 'USD');
-  inc(r);                           *)
+  inc(r);
   MyWorksheet.WriteUTF8Text(r, 0, 'nfCurrencyRed, 0 decs');
   MyWorksheet.WriteCurrency(r, 1, number, nfCurrencyRed, 0, 'USD');
   MyWorksheet.WriteCurrency(r, 2, -number, nfCurrencyRed, 0, 'USD');
   MyWorksheet.WriteCurrency(r, 3, 0.0, nfCurrencyRed, 0, 'USD');
-  inc(r);                   (*
+  inc(r);
   MyWorksheet.WriteUTF8Text(r, 0, 'nfAccounting, 0 decs');
   MyWorksheet.WriteCurrency(r, 1, number, nfAccounting, 0, 'USD');
   MyWorksheet.WriteCurrency(r, 2, -number, nfAccounting, 0, 'USD');
@@ -416,7 +415,7 @@ begin
   MyWorksheet.WriteUTF8Text(0, 3, Str_Fourth);
   MyWorksheet.WriteTextRotation(0, 0, rt90DegreeClockwiseRotation);
   MyWorksheet.WriteUsedFormatting(0, 1, [uffBold]);
-                                 *)
+
   // Save the spreadsheet to a file
   MyWorkbook.WriteToFile(MyDir + 'test.xls', sfExcel8, true);
   MyWorkbook.Free;
diff --git a/components/fpspreadsheet/examples/opendocdemo/opendocread.lpr b/components/fpspreadsheet/examples/opendocdemo/opendocread.lpr
index 78d31f78d..fcd575df1 100644
--- a/components/fpspreadsheet/examples/opendocdemo/opendocread.lpr
+++ b/components/fpspreadsheet/examples/opendocdemo/opendocread.lpr
@@ -28,6 +28,10 @@ begin
   // Open the input file
   MyDir := ExtractFilePath(ParamStr(0));
   InputFileName := MyDir + 'test.ods';
+  if not FileExists(InputFileName) then begin
+    WriteLn('Input file ', InputFileName, ' does not exist. Please run opendocwrite first.');
+    Halt;
+  end;
   WriteLn('Opening input file ', InputFilename);
 
   // Create the spreadsheet
diff --git a/components/fpspreadsheet/examples/opendocdemo/opendocwrite.lpr b/components/fpspreadsheet/examples/opendocdemo/opendocwrite.lpr
index 97f4fcc0c..19a0fb20d 100644
--- a/components/fpspreadsheet/examples/opendocdemo/opendocwrite.lpr
+++ b/components/fpspreadsheet/examples/opendocdemo/opendocwrite.lpr
@@ -36,8 +36,6 @@ begin
   MyWorksheet := MyWorkbook.AddWorksheet('My Worksheet');
 
   // Write some cells
-  MyWorksheet.WriteNumber(0, 0, 1.0, nfPercentage, 2);// A1
-  (*
   MyWorksheet.WriteNumber(0, 1, 2.0);// B1
   MyWorksheet.WriteNumber(0, 2, 3.0);// C1
   MyWorksheet.WriteNumber(0, 3, 4.0);// D1
@@ -235,7 +233,7 @@ begin
 
   // Creates a new worksheet
   MyWorksheet := MyWorkbook.AddWorksheet('My Worksheet 2');
-*)
+
   // Save the spreadsheet to a file
   MyWorkbook.WriteToFile(MyDir + 'test.ods',
     sfOpenDocument);