diff --git a/components/codetools/stdcodetools.pas b/components/codetools/stdcodetools.pas
index 9a68a79d81..9b1cc27236 100644
--- a/components/codetools/stdcodetools.pas
+++ b/components/codetools/stdcodetools.pas
@@ -1542,7 +1542,7 @@ function TStandardCodeTool.CheckLFM(LFMBuf: TCodeBuffer; var LFMTree: TLFMTree;
   RootMustBeClassInIntf, ObjectsMustExists: boolean): boolean;
 var
   RootContext: TFindContext;
-
+  
   function CheckLFMObjectValues(LFMObject: TLFMObjectNode;
     const ClassContext: TFindContext): boolean; forward;
 
@@ -1821,7 +1821,6 @@ var
     VariableTypeName: String;
     DefinitionNode: TCodeTreeNode;
     ClassContext: TFindContext;
-    PropertyTypeName: String;
   begin
     // find variable for object
     
@@ -1850,7 +1849,8 @@ var
         exit;
       end;
 
-      // check if identifier is a variable
+      // check if identifier is a variable or property
+      VariableTypeName:='';
       if (ChildContext.Node.Desc=ctnVarDefinition) then begin
         DefinitionNode:=ChildContext.Tool.FindTypeNodeOfDefinition(
                                                              ChildContext.Node);
@@ -1863,38 +1863,12 @@ var
           exit;
         end;
 
-        // check if variable has a compatible type
-        if LFMObject.TypeName<>'' then begin
-          VariableTypeName:=ChildContext.Tool.ExtractDefinitionNodeType(
+        VariableTypeName:=ChildContext.Tool.ExtractDefinitionNodeType(
                                                              ChildContext.Node);
-          if (CompareIdentifiers(PChar(VariableTypeName),
-                   PChar(LFMObject.TypeName))<>0)
-          then begin
-            ChildContext.Node:=DefinitionNode;
-            LFMTree.AddError(lfmeObjectIncompatible,LFMObject,
-                           VariableTypeName+' expected, but '+LFMObject.TypeName+' found.'
-                           +CreateFootNote(ChildContext),
-                           LFMObject.NamePosition);
-            exit;
-          end;
-        end;
       end else if (ChildContext.Node.Desc=ctnProperty) then begin
-        // check if variable has a compatible type
         DefinitionNode:=ChildContext.Node;
-        if LFMObject.TypeName<>'' then begin
-          PropertyTypeName:=
+        VariableTypeName:=
                ChildContext.Tool.ExtractPropType(ChildContext.Node,false,false);
-          if (CompareIdentifiers(PChar(PropertyTypeName),
-                   PChar(LFMObject.TypeName))<>0)
-          then begin
-            ChildContext.Node:=DefinitionNode;
-            LFMTree.AddError(lfmeObjectIncompatible,LFMObject,
-                           PropertyTypeName+' expected, but '+LFMObject.TypeName+' found.'
-                           +CreateFootNote(ChildContext),
-                           LFMObject.NamePosition);
-            exit;
-          end;
-        end;
       end else begin
         LFMTree.AddError(lfmeObjectIncompatible,LFMObject,
                          LFMObjectName+' is not a variable'
@@ -1902,6 +1876,25 @@ var
                          LFMObject.NamePosition);
         exit;
       end;
+      
+      // check if variable/property has a compatible type
+      if (VariableTypeName<>'') then begin
+        if (LFMObject.TypeName<>'')
+        and (CompareIdentifiers(PChar(VariableTypeName),
+                                PChar(LFMObject.TypeName))<>0)
+        then begin
+          ChildContext.Node:=DefinitionNode;
+          LFMTree.AddError(lfmeObjectIncompatible,LFMObject,
+                         VariableTypeName+' expected, but '+LFMObject.TypeName+' found.'
+                         +CreateFootNote(ChildContext),
+                         LFMObject.NamePosition);
+          exit;
+        end;
+        
+        // check if variable/property type exists
+        
+      end;
+
 
       // find class node
       ClassContext:=FindClassNodeForLFMObject(LFMObject,LFMObject.TypeNamePosition,
diff --git a/lcl/interfaces/gtk/gtkpagecallback.inc b/lcl/interfaces/gtk/gtkpagecallback.inc
index b78390af1b..cee05c209d 100644
--- a/lcl/interfaces/gtk/gtkpagecallback.inc
+++ b/lcl/interfaces/gtk/gtkpagecallback.inc
@@ -15,7 +15,7 @@
  *****************************************************************************
 }
 
-procedure DrawNotebookPageIcon(Page: TPage; Widget: PGtkWidget);
+procedure DrawNotebookPageIcon(Page: TCustomPage; Widget: PGtkWidget);
 var
   NoteBook: TCustomNotebook;
   NoteBookWidget: PGtkWidget;
@@ -41,13 +41,13 @@ end;
 function PageIconWidgetExposeAfter(Widget: PGtkWidget; Event: PGDKEventExpose;
   Data: gPointer): GBoolean; cdecl;
 var
-  ThePage: TPage;
+  ThePage: TCustomPage;
 begin
   Result := false;
   //DebugLn('PageIconWidgetExposeAfter ',DbgS(Widget));
   EventTrace('PageIconWidgetExposeAfter', Data);
   if (Event^.Count > 0) then exit;
-  ThePage:=TObject(Data) as TPage;
+  ThePage:=TObject(Data) as TCustomPage;
   DrawNotebookPageIcon(ThePage,Widget);
 end;
 
@@ -55,12 +55,12 @@ end;
 function PageIconWidgetDrawAfter(Widget: PGtkWidget; area: PGDKRectangle;
   data: gPointer) : GBoolean; cdecl;
 var
-  ThePage: TPage;
+  ThePage: TCustomPage;
 begin
   Result := false;
   //DebugLn('PageIconWidgetDrawAfter ',DbgS(Widget),' ',Area^.x,',',Area^.y);
   EventTrace('PageIconWidgetDrawAfter', Data);
-  ThePage:=TObject(Data) as TPage;
+  ThePage:=TObject(Data) as TCustomPage;
   DrawNotebookPageIcon(ThePage,Widget);
 end;
 {$ENDIF}