diff --git a/components/tachart/taanimatedsource.pas b/components/tachart/taanimatedsource.pas
index 8a040f9ba5..2cb1ee983b 100644
--- a/components/tachart/taanimatedsource.pas
+++ b/components/tachart/taanimatedsource.pas
@@ -48,8 +48,8 @@ type
   protected
     function GetCount: Integer; override;
     function GetItem(AIndex: Integer): PChartDataItem; override;
-    procedure SetXCount(AValue: Cardinal); override;
-    procedure SetYCount(AValue: Cardinal); override;
+    procedure SetXCount(AValue: Integer); override;
+    procedure SetYCount(AValue: Integer); override;
   public
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -189,13 +189,13 @@ begin
     FOrigin.Broadcaster.Subscribe(FListener);
 end;
 
-procedure TCustomAnimatedChartSource.SetXCount(AValue: Cardinal);
+procedure TCustomAnimatedChartSource.SetXCount(AValue: Integer);
 begin
   Unused(AValue);
   raise EXCountError.Create('Cannot set XCount');
 end;
 
-procedure TCustomAnimatedChartSource.SetYCount(AValue: Cardinal);
+procedure TCustomAnimatedChartSource.SetYCount(AValue: Integer);
 begin
   Unused(AValue);
   raise EYCountError.Create('Cannot set YCount');
diff --git a/components/tachart/taaxissource.pas b/components/tachart/taaxissource.pas
index ab50fe31d9..2f8d75d849 100644
--- a/components/tachart/taaxissource.pas
+++ b/components/tachart/taaxissource.pas
@@ -27,8 +27,8 @@ type
   protected
     function GetCount: Integer; override;
     function GetItem(AIndex: Integer): PChartDataItem; override;
-    procedure SetXCount(AValue: Cardinal); override;
-    procedure SetYCount(AValue: Cardinal); override;
+    procedure SetXCount(AValue: Integer); override;
+    procedure SetYCount(AValue: Integer); override;
   public
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -89,13 +89,13 @@ begin
   Result := true;
 end;
 
-procedure TCustomAxisChartSource.SetXCount(AValue: Cardinal);
+procedure TCustomAxisChartSource.SetXCount(AValue: Integer);
 begin
   Unused(AValue);
   raise EXCountError.Create('Cannot set XCount');
 end;
 
-procedure TCustomAxisChartSource.SetYCount(AValue: Cardinal);
+procedure TCustomAxisChartSource.SetYCount(AValue: Integer);
 begin
   Unused(AValue);
   raise EYCountError.Create('Cannot set YCount');
diff --git a/components/tachart/tacustomsource.pas b/components/tachart/tacustomsource.pas
index 2d35b39611..b95edd9ee4 100644
--- a/components/tachart/tacustomsource.pas
+++ b/components/tachart/tacustomsource.pas
@@ -190,8 +190,8 @@ type
     FExtentIsValid: Boolean;
     FValuesTotal: Double;
     FValuesTotalIsValid: Boolean;
-    FXCount: Cardinal;
-    FYCount: Cardinal;
+    FXCount: Integer;
+    FYCount: Integer;
     procedure ChangeErrorBars(Sender: TObject); virtual;
     function GetCount: Integer; virtual; abstract;
     function GetErrorBarValues(APointIndex: Integer; Which: Integer;
@@ -199,8 +199,8 @@ type
     function GetHasErrorBars(Which: Integer): Boolean;
     function GetItem(AIndex: Integer): PChartDataItem; virtual; abstract;
     procedure InvalidateCaches;
-    procedure SetXCount(AValue: Cardinal); virtual; abstract;
-    procedure SetYCount(AValue: Cardinal); virtual; abstract;
+    procedure SetXCount(AValue: Integer); virtual; abstract;
+    procedure SetYCount(AValue: Integer); virtual; abstract;
     property XErrorBarData: TChartErrorBarData index 0 read GetErrorBarData
       write SetErrorBarData stored IsErrorBarDataStored;
     property YErrorBarData: TChartErrorBarData index 1 read GetErrorBarData
@@ -245,8 +245,8 @@ type
 
     property Count: Integer read GetCount;
     property Item[AIndex: Integer]: PChartDataItem read GetItem; default;
-    property XCount: Cardinal read FXCount write SetXCount default 1;
-    property YCount: Cardinal read FYCount write SetYCount default 1;
+    property XCount: Integer read FXCount write SetXCount default 1;
+    property YCount: Integer read FYCount write SetYCount default 1;
   end;
 
   { TChartSourceBuffer }
diff --git a/components/tachart/tadbsource.pas b/components/tachart/tadbsource.pas
index 3cf80407b1..0a02ef987d 100644
--- a/components/tachart/tadbsource.pas
+++ b/components/tachart/tadbsource.pas
@@ -52,7 +52,7 @@ type
   protected
     function GetCount: Integer; override;
     function GetItem(AIndex: Integer): PChartDataItem; override;
-    procedure SetYCount(AValue: Cardinal); override;
+    procedure SetYCount(AValue: Integer); override;
   public
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -322,7 +322,7 @@ begin
   Reset;
 end;
 
-procedure TDbChartSource.SetYCount(AValue: Cardinal);
+procedure TDbChartSource.SetYCount(AValue: Integer);
 begin
   Unused(AValue);
   raise EYCountError.Create('Set FieldY instead');
diff --git a/components/tachart/taintervalsources.pas b/components/tachart/taintervalsources.pas
index 19c6896212..7dea25ba7c 100644
--- a/components/tachart/taintervalsources.pas
+++ b/components/tachart/taintervalsources.pas
@@ -32,8 +32,8 @@ type
   protected
     function GetCount: Integer; override;
     function GetItem(AIndex: Integer): PChartDataItem; override;
-    procedure SetXCount(AValue: Cardinal); override;
-    procedure SetYCount(AValue: Cardinal); override;
+    procedure SetXCount(AValue: Integer); override;
+    procedure SetYCount(AValue: Integer); override;
   public
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -363,13 +363,13 @@ begin
   Notify;
 end;
 
-procedure TIntervalChartSource.SetXCount(AValue: Cardinal);
+procedure TIntervalChartSource.SetXCount(AValue: Integer);
 begin
   Unused(AValue);
   raise EXCountError.Create('Cannot set XCount');
 end;
 
-procedure TIntervalChartSource.SetYCount(AValue: Cardinal);
+procedure TIntervalChartSource.SetYCount(AValue: Integer);
 begin
   Unused(AValue);
   raise EYCountError.Create('Cannot set YCount');
diff --git a/components/tachart/tamultiseries.pas b/components/tachart/tamultiseries.pas
index 4baa024649..865efd5c8c 100644
--- a/components/tachart/tamultiseries.pas
+++ b/components/tachart/tamultiseries.pas
@@ -633,7 +633,6 @@ var
   R: TRect;
   RArray: array[0..3] of Integer absolute R;
   isneg: Boolean;
-  p: Integer;
   dir: TLabelDirection;
 begin
   if (AYIndex = 1) and GetBubbleRect(Source.Item[AIndex + FLoBound], R) then begin
@@ -875,7 +874,6 @@ var
   gp: TDoublePoint;
   scMarksDistance: Integer;
   center: Double;
-  ysum: Double;
 begin
   if not Marks.IsMarkLabelsVisible or not Marks.AutoMargins then exit;
   if Count = 0 then exit;
@@ -1430,7 +1428,7 @@ procedure TOpenHighLowCloseSeries.Draw(ADrawer: IChartDrawer);
   end;
 
 var
-  my: Cardinal;
+  my: Integer;
   ext2: TDoubleRect;
   i: Integer;
   x, tw, yopen, yhigh, ylow, yclose: Double;
diff --git a/components/tachart/tasources.pas b/components/tachart/tasources.pas
index dfd0be99a4..2905656124 100644
--- a/components/tachart/tasources.pas
+++ b/components/tachart/tasources.pas
@@ -37,8 +37,8 @@ type
   protected
     function GetCount: Integer; override;
     function GetItem(AIndex: Integer): PChartDataItem; override;
-    procedure SetXCount(AValue: Cardinal); override;
-    procedure SetYCount(AValue: Cardinal); override;
+    procedure SetXCount(AValue: Integer); override;
+    procedure SetYCount(AValue: Integer); override;
   public
     type
       EXListEmptyError = class(EChartError);
@@ -123,8 +123,8 @@ type
     procedure ChangeErrorBars(Sender: TObject); override;
     function GetCount: Integer; override;
     function GetItem(AIndex: Integer): PChartDataItem; override;
-    procedure SetXCount(AValue: Cardinal); override;
-    procedure SetYCount(AValue: Cardinal); override;
+    procedure SetXCount(AValue: Integer); override;
+    procedure SetYCount(AValue: Integer); override;
   public
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -165,8 +165,8 @@ type
   protected
     function GetCount: Integer; override;
     function GetItem(AIndex: Integer): PChartDataItem; override;
-    procedure SetXCount(AValue: Cardinal); override;
-    procedure SetYCount(AValue: Cardinal); override;
+    procedure SetXCount(AValue: Integer); override;
+    procedure SetYCount(AValue: Integer); override;
   public
     procedure EndUpdate; override;
     function IsSorted: Boolean; override;
@@ -197,7 +197,7 @@ type
     FItem: TChartDataItem;
     FListener: TListener;
     FOrigin: TCustomChartSource;
-    FOriginYCount: Cardinal;
+    FOriginYCount: Integer;
     FPercentage: Boolean;
     FReorderYList: String;
     FYOrder: array of Integer;
@@ -220,8 +220,8 @@ type
   protected
     function GetCount: Integer; override;
     function GetItem(AIndex: Integer): PChartDataItem; override;
-    procedure SetXCount(AValue: Cardinal); override;
-    procedure SetYCount(AValue: Cardinal); override;
+    procedure SetXCount(AValue: Integer); override;
+    procedure SetYCount(AValue: Integer); override;
   public
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -350,7 +350,7 @@ var
 begin
   parts := Split(AString);
   try
-    if (FSource.XCount = 1) and (FSource.YCount + 3 < Cardinal(parts.Count)) then
+    if (FSource.XCount = 1) and (FSource.YCount + 3 < parts.Count) then
       FSource.YCount := parts.Count - 3;
     with ADataItem^ do begin
       X := StrToFloatOrDateTimeDef(NextPart);
@@ -575,7 +575,7 @@ begin
   Notify;
 end;
 
-procedure TListChartSource.SetXCount(AValue: Cardinal);
+procedure TListChartSource.SetXCount(AValue: Integer);
 var
   i: Integer;
 begin
@@ -649,7 +649,7 @@ begin
   Notify;
 end;
 
-procedure TListChartSource.SetYCount(AValue: Cardinal);
+procedure TListChartSource.SetYCount(AValue: Integer);
 var
   i: Integer;
 begin
@@ -935,7 +935,7 @@ begin
   Reset;
 end;
 
-procedure TRandomChartSource.SetXCount(AValue: Cardinal);
+procedure TRandomChartSource.SetXCount(AValue: Integer);
 begin
   if XCount = AValue then exit;
   FXCount := AValue;
@@ -956,7 +956,7 @@ begin
   Reset;
 end;
 
-procedure TRandomChartSource.SetYCount(AValue: Cardinal);
+procedure TRandomChartSource.SetYCount(AValue: Integer);
 begin
   if YCount = AValue then exit;
   FYCount := AValue;
@@ -1034,7 +1034,7 @@ begin
   Reset;
 end;
 
-procedure TUserDefinedChartSource.SetXCount(AValue: Cardinal);
+procedure TUserDefinedChartSource.SetXCount(AValue: Integer);
 begin
   if FXCount = AValue then exit;
   FXCount := AValue;
@@ -1042,7 +1042,7 @@ begin
   Reset;
 end;
 
-procedure TUserDefinedChartSource.SetYCount(AValue: Cardinal);
+procedure TUserDefinedChartSource.SetYCount(AValue: Integer);
 begin
   if FYCount = AValue then exit;
   FYCount := AValue;
@@ -1372,13 +1372,13 @@ begin
   UpdateYOrder;
 end;
 
-procedure TCalculatedChartSource.SetXCount(AValue: Cardinal);
+procedure TCalculatedChartSource.SetXCount(AValue: Integer);
 begin
   Unused(AValue);
   raise EXCountError.Create('Cannot set XCount');
 end;
 
-procedure TCalculatedChartSource.SetYCount(AValue: Cardinal);
+procedure TCalculatedChartSource.SetYCount(AValue: Integer);
 begin
   Unused(AValue);
   raise EYCountError.Create('Cannot set YCount');