diff --git a/lcl/extctrls.pp b/lcl/extctrls.pp
index ffc3042969..2d8891f5a3 100644
--- a/lcl/extctrls.pp
+++ b/lcl/extctrls.pp
@@ -65,12 +65,12 @@ type
     function GetPageIndex: integer;
     procedure SetPageIndex(AValue: Integer);
   public
-    property PageIndex: Integer read GetPageIndex write SetPageIndex;
-    property TabVisible: Boolean read GetTabVisible write SetTabVisible default True;
     constructor Create(TheOwner: TComponent); override;
     procedure AdjustClientRect(var ARect: TRect); override;
     function CanTab: boolean; override;
     function IsVisible: Boolean; override;
+    property PageIndex: Integer read GetPageIndex write SetPageIndex;
+    property TabVisible: Boolean read GetTabVisible write SetTabVisible default True;
     property ImageIndex: integer read FImageIndex write SetImageIndex default -1;
     property Left stored False;
     property Top stored False;
diff --git a/lcl/grids.pas b/lcl/grids.pas
index 532e3c8800..ccbe1a1d61 100644
--- a/lcl/grids.pas
+++ b/lcl/grids.pas
@@ -3399,15 +3399,13 @@ begin
 end;
 
 procedure TCustomGrid.SetFlat(const AValue: Boolean);
-var
-  Bs: TBorderStyle;
 begin
   if FFlat=AValue then exit;
   FFlat:=AValue;
   if FGridBorderStyle=bsSingle then
     UpdateBorderStyle
   else
-  Invalidate;
+    Invalidate;
 end;
 
 procedure TCustomGrid.SetFocusRectVisible(const AValue: Boolean);
diff --git a/lcl/include/custompage.inc b/lcl/include/custompage.inc
index a4327b5eb9..5aaa1c8bc4 100644
--- a/lcl/include/custompage.inc
+++ b/lcl/include/custompage.inc
@@ -27,7 +27,7 @@ begin
   fTabVisible := True;
   ControlStyle := ControlStyle + [csAcceptsControls,csDesignFixedBounds,csNoDesignVisible];
 
-  // height and width dependent on parent, align to client rect
+  // height and width depends on parent, align to client rect
   Align := alClient;
   Caption := '';
   Visible := false;