diff --git a/lcl/calendar.pp b/lcl/calendar.pp
index 6a84922de8..01c4bf9980 100644
--- a/lcl/calendar.pp
+++ b/lcl/calendar.pp
@@ -191,6 +191,9 @@ begin
     FDateAsString := AValue;
     FDate := NewDate;
   except
+    // TODO: remove test for csLoading after fpc 2.0.4 has been released
+    // The Date property is not supposed to be stored, but earlier fpc version
+    // did this anyway.
     if not (csLoading in ComponentState) then
       raise EInvalidDate.CreateFmt(rsInvalidDate, [AValue])
     else
diff --git a/lcl/forms.pp b/lcl/forms.pp
index 38c936b454..d4e8ea162b 100644
--- a/lcl/forms.pp
+++ b/lcl/forms.pp
@@ -655,6 +655,8 @@ type
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
     procedure ActivateHint(ARect: TRect; const AHint: String); virtual;
+    procedure ActivateHintData(ARect: TRect; const AHint: String;
+                               AData: pointer); virtual;
     function CalcHintRect(MaxWidth: Integer; const AHint: String;
                           AData: Pointer): TRect; virtual;
     procedure ReleaseHandle;
diff --git a/lcl/include/hintwindow.inc b/lcl/include/hintwindow.inc
index 95ddf0b940..654ec23dbf 100644
--- a/lcl/include/hintwindow.inc
+++ b/lcl/include/hintwindow.inc
@@ -90,6 +90,12 @@ begin
 end;
 
 procedure THintWindow.ActivateHint(ARect: TRect; const AHint: String);
+begin
+  ActivateHintData(ARect, AHint, nil);
+end;
+
+procedure THintWindow.ActivateHintData(ARect: TRect; const AHint: String;
+  AData: pointer);
 var
   InvalidateNeeded: Boolean;
 begin