diff --git a/components/rx/Demos/RxDBGrid/RxDBGridDemo.lpi b/components/rx/Demos/RxDBGrid/RxDBGridDemo.lpi
index 7f08719be..d92789b02 100644
--- a/components/rx/Demos/RxDBGrid/RxDBGridDemo.lpi
+++ b/components/rx/Demos/RxDBGrid/RxDBGridDemo.lpi
@@ -53,7 +53,7 @@
         <MinVersion Major="1" Release="18" Build="56" Valid="True"/>
       </Item4>
     </RequiredPackages>
-    <Units Count="62">
+    <Units Count="63">
       <Unit0>
         <Filename Value="RxDBGridDemo.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -69,11 +69,10 @@
         <ComponentName Value="RxDBGridMainForm"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="RxDBGridMainUnit"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="0"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
-        <CursorPos X="73" Y="8"/>
+        <CursorPos X="12" Y="9"/>
         <UsageCount Value="53"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -393,15 +392,17 @@
       <Unit45>
         <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
         <UnitName Value="rxdbgrid"/>
+        <EditorIndex Value="1"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="1895"/>
-        <CursorPos X="32" Y="1920"/>
+        <TopLine Value="37"/>
+        <CursorPos X="48" Y="41"/>
         <UsageCount Value="16"/>
         <Bookmarks Count="3">
           <Item0 X="3" Y="2250" ID="3"/>
           <Item1 X="13" Y="1203" ID="1"/>
           <Item2 X="11" Y="1606" ID="2"/>
         </Bookmarks>
+        <Loaded Value="True"/>
       </Unit45>
       <Unit46>
         <Filename Value="/usr/local/share/lazarus/ideintf/dbpropedits.pas"/>
@@ -540,8 +541,19 @@
         <CursorPos X="1" Y="1113"/>
         <UsageCount Value="10"/>
       </Unit61>
+      <Unit62>
+        <Filename Value="../../../../../../install/fpcsrc/packages/fcl-db/src/base/db.pas"/>
+        <UnitName Value="db"/>
+        <IsVisibleTab Value="True"/>
+        <EditorIndex Value="2"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="541"/>
+        <CursorPos X="1" Y="569"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit62>
     </Units>
-    <JumpHistory Count="2" HistoryIndex="1">
+    <JumpHistory Count="3" HistoryIndex="2">
       <Position1>
         <Filename Value="rxdbgridmainunit.pas"/>
         <Caret Line="161" Column="14" TopLine="148"/>
@@ -550,6 +562,10 @@
         <Filename Value="rxdbgridmainunit.pas"/>
         <Caret Line="8" Column="73" TopLine="1"/>
       </Position2>
+      <Position3>
+        <Filename Value="rxdbgridmainunit.pas"/>
+        <Caret Line="9" Column="12" TopLine="1"/>
+      </Position3>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
diff --git a/components/rx/pickdate.pas b/components/rx/pickdate.pas
index 1dc9e0aa6..1c522e02f 100644
--- a/components/rx/pickdate.pas
+++ b/components/rx/pickdate.pas
@@ -318,7 +318,7 @@ begin
   for i:=1 to 12 do
   begin
     MI:=TMenuItem.Create(Result);
-    MI.Caption := LongMonthNames[i - 1];
+    MI.Caption := LongMonthNames[i];
     MI.OnClick:=AOnClick;
     MI.Tag:=i;
     Result.Items.Add(MI);
@@ -1245,7 +1245,7 @@ var
   AYear, AMonth, ADay: Word;
 begin
   DecodeDate(FCalendar.CalendarDate, AYear, AMonth, ADay);
-  s := Format('%s, %d', [LongMonthNames[AMonth - 1], AYear]);
+  s := Format('%s, %d', [LongMonthNames[AMonth], AYear]);
   FTitleLabel.Caption := s; //
   // FTitleLabel.Caption := FormatDateTime('MMMM, YYYY', FCalendar.CalendarDate);
 end;