diff --git a/components/fpspreadsheet/laz_fpspreadsheet.lpk b/components/fpspreadsheet/laz_fpspreadsheet.lpk
index 5605c1c96..52b2ea4d7 100644
--- a/components/fpspreadsheet/laz_fpspreadsheet.lpk
+++ b/components/fpspreadsheet/laz_fpspreadsheet.lpk
@@ -19,7 +19,7 @@
       </Parsing>
       <Other>
         <CompilerMessages>
-          <IgnoredMessages idx5028="True" idx4055="True" idx2005="True"/>
+          <IgnoredMessages idx6058="True" idx5028="True" idx4055="True" idx2005="True"/>
         </CompilerMessages>
         <CustomOptions Value="$(IDEBuildOptions)
 -dDisableWrapperFunctions"/>
diff --git a/components/fpspreadsheet/source/common/fpscell.pas b/components/fpspreadsheet/source/common/fpscell.pas
index cee44d4a7..4ee3f241f 100644
--- a/components/fpspreadsheet/source/common/fpscell.pas
+++ b/components/fpspreadsheet/source/common/fpscell.pas
@@ -2,7 +2,7 @@ unit fpsCell;
 
 {$mode objfpc}{$H+}
 {$modeswitch advancedrecords}
-
+{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
 interface
 
 uses
diff --git a/components/fpspreadsheet/source/common/fpsconditionalformat.pas b/components/fpspreadsheet/source/common/fpsconditionalformat.pas
index c05a07d5c..65c1f01dd 100644
--- a/components/fpspreadsheet/source/common/fpsconditionalformat.pas
+++ b/components/fpspreadsheet/source/common/fpsconditionalformat.pas
@@ -1,7 +1,7 @@
 unit fpsConditionalFormat;
 
 {$mode objfpc}{$H+}
-
+{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
 interface
 
 uses
diff --git a/components/fpspreadsheet/source/common/fpsfunc.pas b/components/fpspreadsheet/source/common/fpsfunc.pas
index 988777e0b..f72afd617 100644
--- a/components/fpspreadsheet/source/common/fpsfunc.pas
+++ b/components/fpspreadsheet/source/common/fpsfunc.pas
@@ -5,7 +5,7 @@
 unit fpsfunc;
 
 {$mode objfpc}{$H+}
-
+{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
 interface
 
 uses
diff --git a/components/fpspreadsheet/source/common/fpsopendocument.pas b/components/fpspreadsheet/source/common/fpsopendocument.pas
index 68b3a5081..ec94b640c 100644
--- a/components/fpspreadsheet/source/common/fpsopendocument.pas
+++ b/components/fpspreadsheet/source/common/fpsopendocument.pas
@@ -28,7 +28,7 @@ unit fpsOpenDocument;
 {$ifdef fpc}
   {$mode objfpc}{$H+}
 {$endif}
-
+{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
 {$I ..\fps.inc}
 
 interface
@@ -3985,7 +3985,8 @@ begin
     ANode := ANode.NextSibling;
   end;
 
-  n := MinValue([Length(values), Length(kinds), Length(colors)]);
+  n := MinValue([Integer(Length(values)), Integer(Length(kinds)), Integer(Length(colors))]);
+  // Cast needed due to stupid 64-bit FPC not knowing which overload to select ...
   case n of
     0,
     1: exit;
@@ -4058,7 +4059,8 @@ begin
   if (posColor = scNotDefined) and (negColor <> scNotDefined) then
     posColor := negColor;
 
-  n := MaxValue([Length(values), Length(kinds)]);
+  n := MinValue([Integer(Length(values)), Integer(Length(kinds))]);
+  // Cast needed due to stupid 64-bit FPC not knowing which overload to select...
   if n < 2 then
     exit;
 
diff --git a/components/fpspreadsheet/source/common/fpspagelayout.pas b/components/fpspreadsheet/source/common/fpspagelayout.pas
index c5983d738..d417a257c 100644
--- a/components/fpspreadsheet/source/common/fpspagelayout.pas
+++ b/components/fpspreadsheet/source/common/fpspagelayout.pas
@@ -1,7 +1,7 @@
 unit fpsPageLayout;
 
 {$mode objfpc}{$H+}
-
+{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
 interface
 
 uses
diff --git a/components/fpspreadsheet/source/common/fpspreadsheet.pas b/components/fpspreadsheet/source/common/fpspreadsheet.pas
index e4d8a48c9..89b00b5ff 100644
--- a/components/fpspreadsheet/source/common/fpspreadsheet.pas
+++ b/components/fpspreadsheet/source/common/fpspreadsheet.pas
@@ -13,7 +13,7 @@ unit fpSpreadsheet;
   {$mode delphi}{$H+}
 //  {$mode objpas}{$H+}
 {$endif}
-
+{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
 {$include ..\fps.inc}
 
 interface
diff --git a/components/fpspreadsheet/source/common/fpsutils.pas b/components/fpspreadsheet/source/common/fpsutils.pas
index 8e2cf60c0..624277cc1 100644
--- a/components/fpspreadsheet/source/common/fpsutils.pas
+++ b/components/fpspreadsheet/source/common/fpsutils.pas
@@ -2975,8 +2975,8 @@ begin
     // chromatic case
     // saturation
     if L <= 128
-    then S := integer(diff * 255) div (cMax + cMin)
-    else S := integer(diff * 255) div (510 - cMax - cMin);
+    then S := (diff * 255) div (cMax + cMin)
+    else S := (diff * 255) div (510 - cMax - cMin);
 
     // hue
     Rdelta := (cMax - R);
@@ -2984,10 +2984,10 @@ begin
     Bdelta := (cMax - B);
 
     if R = cMax
-    then H := (HUE_000 + integer(Bdelta - Gdelta) * HUE_060 div diff) and $ff
+    then H := (HUE_000 + (Bdelta - Gdelta) * HUE_060 div diff) and $ff
     else if G = cMax
-    then H := HUE_120 + integer(Rdelta - Bdelta) * HUE_060 div diff
-    else H := HUE_240 + integer(Gdelta - Rdelta) * HUE_060 div diff;
+    then H := HUE_120 + (Rdelta - Bdelta) * HUE_060 div diff
+    else H := HUE_240 + (Gdelta - Rdelta) * HUE_060 div diff;
   end;
 end;
 
diff --git a/components/fpspreadsheet/source/common/uvirtuallayer_ole_helpers.pas b/components/fpspreadsheet/source/common/uvirtuallayer_ole_helpers.pas
index afc1e8a85..f8dd79722 100644
--- a/components/fpspreadsheet/source/common/uvirtuallayer_ole_helpers.pas
+++ b/components/fpspreadsheet/source/common/uvirtuallayer_ole_helpers.pas
@@ -15,7 +15,7 @@ AUTHORS: José Mejuto Porral
 unit uvirtuallayer_ole_helpers;
 
 {$mode objfpc}{$H+}
-
+{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
 interface
 
 uses
diff --git a/components/fpspreadsheet/source/common/xlscommon.pas b/components/fpspreadsheet/source/common/xlscommon.pas
index e04600f42..e038ff031 100644
--- a/components/fpspreadsheet/source/common/xlscommon.pas
+++ b/components/fpspreadsheet/source/common/xlscommon.pas
@@ -6,7 +6,7 @@ OpenOffice Microsoft Excel File Format document }
 {$ifdef fpc}
   {$mode objfpc}{$H+}
 {$endif}
-
+{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
 {$I fps.inc}
 
 interface
diff --git a/components/fpspreadsheet/source/common/xlsxml.pas b/components/fpspreadsheet/source/common/xlsxml.pas
index a40d9fe81..2b42bb6dc 100644
--- a/components/fpspreadsheet/source/common/xlsxml.pas
+++ b/components/fpspreadsheet/source/common/xlsxml.pas
@@ -17,7 +17,7 @@ unit xlsxml;
 {$ifdef fpc}
   {$mode objfpc}{$H+}
 {$endif}
-
+{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
 interface
 
 uses
diff --git a/components/fpspreadsheet/source/common/xlsxooxml.pas b/components/fpspreadsheet/source/common/xlsxooxml.pas
index 89910ecc7..d1dc7ad6f 100644
--- a/components/fpspreadsheet/source/common/xlsxooxml.pas
+++ b/components/fpspreadsheet/source/common/xlsxooxml.pas
@@ -30,7 +30,7 @@ unit xlsxooxml;
 {$ifdef fpc}
   {$mode objfpc}{$H+}
 {$endif}
-
+{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
 interface
 
 uses