diff --git a/components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/fpschartsource.lpi b/components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/fpschartsource.lpi
index c88fc3366..52a0a9779 100644
--- a/components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/fpschartsource.lpi
+++ b/components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/fpschartsource.lpi
@@ -85,7 +85,7 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <UnitOutputDirectory Value="..\..\..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <CodeGeneration>
       <SmartLinkUnit Value="True"/>
diff --git a/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/fpschart.lpi b/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/fpschart.lpi
index 2cd47aa05..f7e0b7d64 100644
--- a/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/fpschart.lpi
+++ b/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/fpschart.lpi
@@ -66,7 +66,7 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <UnitOutputDirectory Value="../../../lib/$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>
       <Options>
diff --git a/components/fpspreadsheet/examples/visual/fpsctrls/demo_ctrls.lpi b/components/fpspreadsheet/examples/visual/fpsctrls/demo_ctrls.lpi
index 531d79d6c..95a0b9ae3 100644
--- a/components/fpspreadsheet/examples/visual/fpsctrls/demo_ctrls.lpi
+++ b/components/fpspreadsheet/examples/visual/fpsctrls/demo_ctrls.lpi
@@ -81,7 +81,7 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <CodeGeneration>
       <SmartLinkUnit Value="True"/>
diff --git a/components/fpspreadsheet/examples/visual/fpsgrid/fpsgrid.lpi b/components/fpspreadsheet/examples/visual/fpsgrid/fpsgrid.lpi
index 2acfb6fa5..0943006f2 100644
--- a/components/fpspreadsheet/examples/visual/fpsgrid/fpsgrid.lpi
+++ b/components/fpspreadsheet/examples/visual/fpsgrid/fpsgrid.lpi
@@ -60,7 +60,7 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/visual/spready/spready.lpi b/components/fpspreadsheet/examples/visual/spready/spready.lpi
index b5f9a81b2..cc6120b3d 100644
--- a/components/fpspreadsheet/examples/visual/spready/spready.lpi
+++ b/components/fpspreadsheet/examples/visual/spready/spready.lpi
@@ -92,7 +92,7 @@
         <PackageName Value="LCL"/>
       </Item2>
     </RequiredPackages>
-    <Units Count="8">
+    <Units Count="7">
       <Unit0>
         <Filename Value="spready.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -110,33 +110,28 @@
         <IsPartOfProject Value="True"/>
       </Unit2>
       <Unit3>
-        <Filename Value="..\..\fpscurrency.pas"/>
-        <IsPartOfProject Value="True"/>
-      </Unit3>
-      <Unit4>
         <Filename Value="..\shared\scsvparamsform.pas"/>
         <IsPartOfProject Value="True"/>
         <HasResources Value="True"/>
-        <UnitName Value="scsvparamsform"/>
-      </Unit4>
-      <Unit5>
+      </Unit3>
+      <Unit4>
         <Filename Value="..\shared\sfcurrencyform.pas"/>
         <IsPartOfProject Value="True"/>
         <HasResources Value="True"/>
-        <UnitName Value="sfcurrencyform"/>
-      </Unit5>
-      <Unit6>
+      </Unit4>
+      <Unit5>
         <Filename Value="..\shared\sformatsettingsform.pas"/>
         <IsPartOfProject Value="True"/>
         <HasResources Value="True"/>
-        <UnitName Value="sformatsettingsform"/>
-      </Unit6>
-      <Unit7>
+      </Unit5>
+      <Unit6>
         <Filename Value="..\shared\ssortparamsform.pas"/>
         <IsPartOfProject Value="True"/>
+        <ComponentName Value="SortParamsForm"/>
         <HasResources Value="True"/>
-        <UnitName Value="ssortparamsform"/>
-      </Unit7>
+        <ResourceBaseClass Value="Form"/>
+        <UnitName Value="sSortParamsForm"/>
+      </Unit6>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
@@ -148,7 +143,7 @@
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
       <OtherUnitFiles Value="..\shared"/>
-      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>
       <Options>
diff --git a/components/fpspreadsheet/examples/visual/spready/spready.lpr b/components/fpspreadsheet/examples/visual/spready/spready.lpr
index e9a06862c..02dfee942 100644
--- a/components/fpspreadsheet/examples/visual/spready/spready.lpr
+++ b/components/fpspreadsheet/examples/visual/spready/spready.lpr
@@ -4,7 +4,7 @@ program spready;
 
 uses
   Interfaces, // this includes the LCL widgetset
-  Forms, mainform, sCtrls, fpsCurrency,
+  Forms, mainform, sCtrls,
   scsvparamsform, sfcurrencyform, sformatsettingsform, ssortparamsform;
 
 {$R *.res}
diff --git a/components/fpspreadsheet/examples/visual/wikitablemaker/wikitablemaker.lpi b/components/fpspreadsheet/examples/visual/wikitablemaker/wikitablemaker.lpi
index fea474878..1e84b5213 100644
--- a/components/fpspreadsheet/examples/visual/wikitablemaker/wikitablemaker.lpi
+++ b/components/fpspreadsheet/examples/visual/wikitablemaker/wikitablemaker.lpi
@@ -127,7 +127,7 @@
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
       <OtherUnitFiles Value="..\..\.."/>
-      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/fpsopendocument.pas b/components/fpspreadsheet/fpsopendocument.pas
index 9a27d6ca5..fb3727f8a 100755
--- a/components/fpspreadsheet/fpsopendocument.pas
+++ b/components/fpspreadsheet/fpsopendocument.pas
@@ -1470,7 +1470,6 @@ var
   childnode: TDOMNode;
   subnode: TDOMNode;
   nodeName: String;
-  s: String;
   cell: PCell;
   hyperlink: string;
 
@@ -4182,7 +4181,6 @@ var
   fmt: TsCellFormat;
   hyperlink: PsHyperlink;
   u: TUri;
-  i: Integer;
 begin
   Unused(ARow, ACol);
 
diff --git a/components/fpspreadsheet/fpspreadsheet.pas b/components/fpspreadsheet/fpspreadsheet.pas
index 83666be68..64857797d 100755
--- a/components/fpspreadsheet/fpspreadsheet.pas
+++ b/components/fpspreadsheet/fpspreadsheet.pas
@@ -1274,6 +1274,11 @@ begin
   for cell in FCells do
   begin
     if HasFormula(cell) then begin
+      if (cell^.Row = ARow) and (cell^.Col = ACol) then
+      begin
+        Result := true;
+        exit;
+      end;
       rpnFormula := BuildRPNFormula(cell);
       for i := 0 to Length(rpnFormula)-1 do
       begin
@@ -1601,13 +1606,10 @@ end;
   @param  ACol   Column index of the cell which has been changed
 -------------------------------------------------------------------------------}
 procedure TsWorksheet.ChangedCell(ARow, ACol: Cardinal);
-var
-  cell: PCell;
 begin
   if (FWorkbook.FCalculationLock = 0) and (boAutoCalc in FWorkbook.Options) then
   begin
-    cell := FindCell(ARow, ACol);
-    if HasFormula(cell) or CellUsedInFormula(ARow, ACol) then
+    if CellUsedInFormula(ARow, ACol) then
       CalcFormulas;
   end;
   if Assigned(FOnChangeCell) then