diff --git a/applications/lazstats/source/forms/analysis/comparisons/latinsqrsunit.pas b/applications/lazstats/source/forms/analysis/comparisons/latinsqrsunit.pas
index 2255abe38..22892b7a4 100644
--- a/applications/lazstats/source/forms/analysis/comparisons/latinsqrsunit.pas
+++ b/applications/lazstats/source/forms/analysis/comparisons/latinsqrsunit.pas
@@ -123,7 +123,7 @@ begin
     VarList.BorderSpacing.Bottom + nPerCellEdit.Height +
     ButtonBevel.Height + CloseBtn.BorderSpacing.Top + CloseBtn.Height;
 
-  ParamsPanel.Constraints.MinWidth := MaxValue([
+  ParamsPanel.Constraints.MinWidth := MaxValueI([
     4*CloseBtn.Width + 3*CloseBtn.BorderSpacing.Left,
     MaxValue([ACodeLabel.Width, BCodeLabel.Width, CCodeLabel.Width, DCodeLabel.Width,
       GrpCodeLabel.Width, DepVarlabel.Width])*2 + AInBtn.Width + 2*VarList.BorderSpacing.Right
diff --git a/applications/lazstats/source/forms/analysis/correlation/autocorunit.pas b/applications/lazstats/source/forms/analysis/correlation/autocorunit.pas
index 4a51ba4a1..af93e6ba4 100644
--- a/applications/lazstats/source/forms/analysis/correlation/autocorunit.pas
+++ b/applications/lazstats/source/forms/analysis/correlation/autocorunit.pas
@@ -147,7 +147,7 @@ begin
  begin
    inherited;
 
-   ParamsPanel.Constraints.MinWidth := MaxValue([
+   ParamsPanel.Constraints.MinWidth := MaxValueI([
      GroupBox2.Left + GroupBox2.Width,
      4*CloseBtn.Width + 3*CloseBtn.BorderSpacing.Left
    ]);
diff --git a/applications/lazstats/source/forms/analysis/cross-classification/abcloglinunit.pas b/applications/lazstats/source/forms/analysis/cross-classification/abcloglinunit.pas
index 7c5215366..681cc29c2 100644
--- a/applications/lazstats/source/forms/analysis/cross-classification/abcloglinunit.pas
+++ b/applications/lazstats/source/forms/analysis/cross-classification/abcloglinunit.pas
@@ -116,7 +116,7 @@ procedure TABCLogLinearForm.AdjustConstraints;
 begin
   inherited;
 
-  ParamsPanel.Constraints.MinWidth := MaxValue([
+  ParamsPanel.Constraints.MinWidth := MaxValueI([
     FileFromGrp.Width,
     NSlicesEdit.Left + NSlicesEdit.Width,
     4*CloseBtn.Width + 3*CloseBtn.BorderSpacing.Left
diff --git a/applications/lazstats/source/forms/analysis/cross-classification/loglinscreenunit.pas b/applications/lazstats/source/forms/analysis/cross-classification/loglinscreenunit.pas
index 794f8bbce..4d633f548 100644
--- a/applications/lazstats/source/forms/analysis/cross-classification/loglinscreenunit.pas
+++ b/applications/lazstats/source/forms/analysis/cross-classification/loglinscreenunit.pas
@@ -125,7 +125,7 @@ uses
 procedure TLogLinScreenForm.AdjustConstraints;
 begin
   inherited;
-  ParamsPanel.Constraints.MinWidth := MaxValue([
+  ParamsPanel.Constraints.MinWidth := MaxValueI([
     4*CloseBtn.Width + 3*CloseBtn.BorderSpacing.Left,
     OptionsGroup.Width,
     Label2.Width * 2 + AllBtn.Width + 2*varList.BorderSpacing.Right +
diff --git a/applications/lazstats/source/forms/analysis/cross-classification/twowayloglinunit.pas b/applications/lazstats/source/forms/analysis/cross-classification/twowayloglinunit.pas
index b3fd74b31..09bf48de7 100644
--- a/applications/lazstats/source/forms/analysis/cross-classification/twowayloglinunit.pas
+++ b/applications/lazstats/source/forms/analysis/cross-classification/twowayloglinunit.pas
@@ -89,7 +89,7 @@ const
 procedure TTwoWayLogLinForm.AdjustConstraints;
 begin
   inherited;
-  ParamsPanel.Constraints.MinWidth := MaxValue([
+  ParamsPanel.Constraints.MinWidth := MaxValueI([
     4*CloseBtn.Width + 3*CloseBtn.BorderSpacing.Left,
     FileFromGrp.Width,
     NoColsEdit.Left + NoColsEdit.Width
diff --git a/applications/lazstats/source/forms/analysis/descriptive/groupfrequnit.pas b/applications/lazstats/source/forms/analysis/descriptive/groupfrequnit.pas
index b4721afe9..768c7af0b 100644
--- a/applications/lazstats/source/forms/analysis/descriptive/groupfrequnit.pas
+++ b/applications/lazstats/source/forms/analysis/descriptive/groupfrequnit.pas
@@ -70,7 +70,7 @@ end;
 
 procedure TGroupFreqForm.AdjustConstraints;
 begin
-  ParamsPanel.Constraints.MinWidth := MaxValue( [
+  ParamsPanel.Constraints.MinWidth := MaxValueI( [
     4*CloseBtn.Width + 3*CloseBtn.BorderSpacing.Left,
     (PlotOptionsGroup.Width - GrpInBtn.Width div 2 + GrpVarEdit.BorderSpacing.Left)*2,
     (Max(Label1.Width, Label2.Width) + GrpvarEdit.BorderSpacing.Left) * 2
diff --git a/applications/lazstats/source/forms/analysis/measurement_programs/comprelunit.pas b/applications/lazstats/source/forms/analysis/measurement_programs/comprelunit.pas
index 86f53b975..1cf41504d 100644
--- a/applications/lazstats/source/forms/analysis/measurement_programs/comprelunit.pas
+++ b/applications/lazstats/source/forms/analysis/measurement_programs/comprelunit.pas
@@ -72,7 +72,7 @@ begin
   RelList.Width := Max(Label3.Width, Label4.Width);
   WeightList.Width := RelList.Width;
 
-  ParamsPanel.Constraints.MinWidth := MaxValue([
+  ParamsPanel.Constraints.MinWidth := MaxValueI([
     GroupBox1.Width,
     4*CloseBtn.Width + 3*CloseBtn.BorderSpacing.Left,
     Max(Label1.Width, Label2.Width)*2 + 2*RelList.Width +
diff --git a/applications/lazstats/source/forms/analysis/nonparametric/chisqrunit.pas b/applications/lazstats/source/forms/analysis/nonparametric/chisqrunit.pas
index b23249b60..872bad94c 100644
--- a/applications/lazstats/source/forms/analysis/nonparametric/chisqrunit.pas
+++ b/applications/lazstats/source/forms/analysis/nonparametric/chisqrunit.pas
@@ -174,7 +174,7 @@ procedure TChiSqrForm.AdjustConstraints;
 begin
   inherited;
 
-  ParamsPanel.Constraints.MinWidth := MaxValue([
+  ParamsPanel.Constraints.MinWidth := MaxValueI([
     4*CloseBtn.Width + 3*CloseBtn.BorderSpacing.Left,
     OptionsGroup.Width,
     InputGrp.Width
diff --git a/applications/lazstats/source/forms/analysis/nonparametric/riditunit.pas b/applications/lazstats/source/forms/analysis/nonparametric/riditunit.pas
index ad224fe69..79be3d40e 100644
--- a/applications/lazstats/source/forms/analysis/nonparametric/riditunit.pas
+++ b/applications/lazstats/source/forms/analysis/nonparametric/riditunit.pas
@@ -144,7 +144,7 @@ procedure TRIDITForm.AdjustConstraints;
 begin
   inherited;
 
-  ParamsPanel.Constraints.MinWidth := MaxValue([
+  ParamsPanel.Constraints.MinWidth := MaxValueI([
     CloseBtn.Width * 4 + CloseBtn.BorderSpacing.Left * 3,
     OptionsGroup.Width,
     AlphaEdit.Left + AlphaEdit.Width
diff --git a/applications/lazstats/source/forms/simulations/genrndvalsunit.pas b/applications/lazstats/source/forms/simulations/genrndvalsunit.pas
index ae2d21ce0..96ac09386 100644
--- a/applications/lazstats/source/forms/simulations/genrndvalsunit.pas
+++ b/applications/lazstats/source/forms/simulations/genrndvalsunit.pas
@@ -240,6 +240,8 @@ begin
           OS3MainFrm.DataGrid.Cells[col,i] := format('%.3f',[RealRnd]);
         end;
       end;
+    else
+      raise Exception.Create('DistType not imlemented.');
   end;
 
   NoVariables := col;
@@ -310,7 +312,7 @@ begin
       end;
       }
     else
-      raise Exception.Create('Unsupported distribution type.');
+      raise Exception.Create('Unsupported distribution type.'){%H-};
   end;
 end;
 
diff --git a/applications/lazstats/source/units/matrixunit.pas b/applications/lazstats/source/units/matrixunit.pas
index fff762dca..1c13df20b 100644
--- a/applications/lazstats/source/units/matrixunit.pas
+++ b/applications/lazstats/source/units/matrixunit.pas
@@ -136,9 +136,6 @@ implementation
 uses
   Math;
 
-const
-  TWO_PI = 2.0 * pi;   // redeclaration to avoid dependence on MathUnit
-
 operator + (A, B: TDblVector): TDblVector;
 var
   i, n: Integer;
diff --git a/applications/lazstats/source/units/utils.pas b/applications/lazstats/source/units/utils.pas
index 3d262c353..776524605 100644
--- a/applications/lazstats/source/units/utils.pas
+++ b/applications/lazstats/source/units/utils.pas
@@ -26,6 +26,8 @@ procedure ErrorMsg(const AMsg: String; const AParams: array of const);
 function CenterString(S: String; Width: Integer): String;
 function IndexOfString(L: StrDyneVec; s: String): Integer;
 
+function MaxValueI(const AData: array of Integer): Integer;
+
 
 implementation
 
@@ -177,5 +179,19 @@ begin
     end;
 end;
 
+
+// reimplements MaxValue of unit Math which cannot be compiled on 64 bit due
+// to "Can't determine which overloaded function to call".
+function MaxValueI(const AData: array of Integer): Integer;
+var
+  i: Integer;
+begin
+  Result := -MaxInt;
+  for i := 0 to High(AData) do
+    if Result > AData[i] then
+      Result := AData[i];
+end;
+
+
 end.