diff --git a/components/tvplanit/examples/fulldemo/demomain.lfm b/components/tvplanit/examples/fulldemo/demomain.lfm
index e727e7e9d..dbd304a5f 100644
--- a/components/tvplanit/examples/fulldemo/demomain.lfm
+++ b/components/tvplanit/examples/fulldemo/demomain.lfm
@@ -775,7 +775,6 @@ object MainForm: TMainForm
         Tag = 0
       end>
     Images = ImageList1
-    ImagesWidth = 0
     ItemFont.Color = clWhite
     SelectedItem = -1
     SelectedItemFont.Color = clWhite
diff --git a/components/tvplanit/examples/navbar/unit1.lfm b/components/tvplanit/examples/navbar/unit1.lfm
index 003356ee2..f47e67e5c 100644
--- a/components/tvplanit/examples/navbar/unit1.lfm
+++ b/components/tvplanit/examples/navbar/unit1.lfm
@@ -128,7 +128,6 @@ object Form1: TForm1
         ContainerIndex = 0
       end>
     Images = Images
-    ImagesWidth = 0
     ItemFont.Color = clWhite
     ItemSpacing = 5
     SelectedItem = -1
diff --git a/components/tvplanit/examples/runtime/unit1.lfm b/components/tvplanit/examples/runtime/unit1.lfm
index 8c24ba99a..9a2976b98 100644
--- a/components/tvplanit/examples/runtime/unit1.lfm
+++ b/components/tvplanit/examples/runtime/unit1.lfm
@@ -7,7 +7,7 @@ object Form1: TForm1
   ClientHeight = 441
   ClientWidth = 934
   OnCreate = FormCreate
-  LCLVersion = '1.9.0.0'
+  LCLVersion = '1.8.4.0'
   object Panel1: TPanel
     Left = 0
     Height = 42
diff --git a/components/tvplanit/examples/runtime/unit1.pas b/components/tvplanit/examples/runtime/unit1.pas
index a0700afc8..ce036fa6f 100644
--- a/components/tvplanit/examples/runtime/unit1.pas
+++ b/components/tvplanit/examples/runtime/unit1.pas
@@ -64,7 +64,7 @@ begin
   ControlLink := TVpControlLink.Create(self);
   ControlLink.Datastore := Datastore;
   // This establishes the links to all controls that depend on Datastore.
-  // Must be called when all dependent controls are created.
+  // Must be called when all dependent controls have been created.
 
   if Datastore.Resources.Count > 0 then
     Datastore.Resource := Datastore.Resources.Items[0];
diff --git a/components/tvplanit/laz_visualplanit.lpk b/components/tvplanit/laz_visualplanit.lpk
index ea56fc89b..4d8aae263 100644
--- a/components/tvplanit/laz_visualplanit.lpk
+++ b/components/tvplanit/laz_visualplanit.lpk
@@ -303,7 +303,7 @@ Contributor(s): "/>
       </Item67>
       <Item68>
         <Filename Value="source\vpxmlds.pas"/>
-        <UnitName Value="VpXmlDs"/>
+        <UnitName Value="VpXmlDS"/>
       </Item68>
       <Item69>
         <Filename Value="source\vpxparsr.pas"/>
@@ -319,11 +319,11 @@ Contributor(s): "/>
       </Item71>
       <Item72>
         <Filename Value="source\vpvcard.pas"/>
-        <UnitName Value="vpvcard"/>
+        <UnitName Value="VpVCard"/>
       </Item72>
       <Item73>
         <Filename Value="source\vpbasedatafiles.pas"/>
-        <UnitName Value="vpbasedatafiles"/>
+        <UnitName Value="VpBaseDataFiles"/>
       </Item73>
       <Item74>
         <Filename Value="source\vpical.pas"/>
diff --git a/components/tvplanit/laz_visualplanit_zeos_design.lpk b/components/tvplanit/laz_visualplanit_zeos_design.lpk
index bd5096039..4989508f3 100644
--- a/components/tvplanit/laz_visualplanit_zeos_design.lpk
+++ b/components/tvplanit/laz_visualplanit_zeos_design.lpk
@@ -14,6 +14,7 @@
         <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)\zeos_design"/>
       </SearchPaths>
     </CompilerOptions>
+    <Description Value="Visual PlanIt datastore for ZEOS database components (Designtime package)"/>
     <Version Major="1" Release="11"/>
     <Files Count="1">
       <Item1>
diff --git a/components/tvplanit/source/vpdayview.pas b/components/tvplanit/source/vpdayview.pas
index 9dd2c92ae..2df6be4d8 100644
--- a/components/tvplanit/source/vpdayview.pas
+++ b/components/tvplanit/source/vpdayview.pas
@@ -1310,6 +1310,11 @@ var
   id: Integer;
   startTime, endTime: TDateTime;
 begin
+  if ReadOnly or (not CheckCreateResource) or
+     (not Assigned(DataStore)) or (not Assigned(DataStore.Resource))
+  then
+    Exit;
+
   dlg := TOpenDialog.Create(nil);
   try
     dlg.Title := RSLoadICalTitle;
diff --git a/components/tvplanit/source/vpnavbar.pas b/components/tvplanit/source/vpnavbar.pas
index 635aae2e4..65639046a 100644
--- a/components/tvplanit/source/vpnavbar.pas
+++ b/components/tvplanit/source/vpnavbar.pas
@@ -344,7 +344,9 @@ type
     property DrawingStyle: TVpFolderDrawingStyle read FDrawingStyle write SetDrawingStyle;
     property FolderCollection: TVpCollection read FFolders write FFolders;
     property Images: TImageList read FImages write SetImages;
-    property ImagesWidth: Integer read FImagesWidth write SetImagesWidth;
+    {$IF LCL_FullVersion >= 1090000}
+    property ImagesWidth: Integer read FImagesWidth write SetImagesWidth default 0;
+    {$ENDIF}
     property ItemFont: TFont read FItemFont write SetItemFont;
     property ItemSpacing: Integer read FItemSpacing write SetItemSpacing stored IsStoredItemSpacing;
     property ItemTheme: TVpItemTheme read FItemTheme write FItemTheme default itNoTheme;
diff --git a/components/tvplanit/source/vptasklist.pas b/components/tvplanit/source/vptasklist.pas
index 8c5f62532..df15781a8 100644
--- a/components/tvplanit/source/vptasklist.pas
+++ b/components/tvplanit/source/vptasklist.pas
@@ -904,8 +904,10 @@ var
   i: Integer;
   id: Integer;
 begin
-  if ReadOnly or (not CheckCreateResource) then
-    exit;
+  if ReadOnly or (not CheckCreateResource) or
+     (not Assigned(DataStore)) or (not Assigned(DataStore.Resource))
+  then
+    Exit;
 
   dlg := TOpenDialog.Create(nil);
   try
diff --git a/components/tvplanit/source/vpweekview.pas b/components/tvplanit/source/vpweekview.pas
index 50db84452..b53e9a705 100644
--- a/components/tvplanit/source/vpweekview.pas
+++ b/components/tvplanit/source/vpweekview.pas
@@ -1222,13 +1222,9 @@ var
   StartTime: TDateTime;
   EndTime: TDateTime;
 begin
-  if ReadOnly then
-    Exit;
-  if not CheckCreateResource then
-    Exit;
-  if not Assigned(DataStore) then
-    Exit;
-  if not Assigned(DataStore.Resource) then
+  if ReadOnly or (not CheckCreateResource) or
+    (not Assigned(DataStore) ) or (not Assigned(DataStore.Resource))
+  then
     Exit;
 
   StartTime := trunc(Date) + 1 / 2; { default to 12:00 noon }
@@ -1253,6 +1249,11 @@ var
   id: Integer;
   startTime, endTime: TDateTime;
 begin
+  if ReadOnly or (not CheckCreateResource) or
+     (not Assigned(DataStore)) or (not Assigned(DataStore.Resource))
+  then
+    Exit;
+
   dlg := TOpenDialog.Create(nil);
   try
     dlg.Title := RSLoadICalTitle;