diff --git a/src/TDF/TDF_Label.cdl b/src/TDF/TDF_Label.cdl
index 199b0db53d..502b6420a6 100755
--- a/src/TDF/TDF_Label.cdl
+++ b/src/TDF/TDF_Label.cdl
@@ -65,11 +65,13 @@ raises
 
 is
     Create returns Label from TDF;
-	---Purpose: Constructs an empty label object.
+        ---Purpose: Constructs an empty label object.
+        ---C++: inline
     
     Create(aNode : LabelNodePtr from TDF) returns Label from TDF
         is private;
         ---Purpose: Reserved to the friends.
+        ---C++: inline
 
 
     Nullify(me : in out);
diff --git a/src/TDF/TDF_Label.cxx b/src/TDF/TDF_Label.cxx
index fc62badde7..a96024e58a 100755
--- a/src/TDF/TDF_Label.cxx
+++ b/src/TDF/TDF_Label.cxx
@@ -30,24 +30,6 @@
 #include <Standard_ImmutableObject.hxx>
 
 
-//=======================================================================
-//function : TDF_Label
-//purpose  : 
-//=======================================================================
-
-TDF_Label::TDF_Label()
-:myLabelNode(NULL)
-{}
-
-//=======================================================================
-//function : TDF_Label
-//purpose  : 
-//=======================================================================
-
-TDF_Label::TDF_Label(const TDF_LabelNodePtr& aNode)
-:myLabelNode(aNode)
-{}
-
 // Attribute methods ++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 
diff --git a/src/TDF/TDF_Label.lxx b/src/TDF/TDF_Label.lxx
index 0ab1498482..11ca13fbd2 100755
--- a/src/TDF/TDF_Label.lxx
+++ b/src/TDF/TDF_Label.lxx
@@ -26,6 +26,14 @@
 #include <TDF_LabelNode.hxx>
 #include <TDF_TagSource.hxx>
 
+inline TDF_Label::TDF_Label()
+:myLabelNode(NULL)
+{}
+
+inline TDF_Label::TDF_Label(const TDF_LabelNodePtr& aNode)
+:myLabelNode(aNode)
+{}
+
 inline void TDF_Label::Nullify()
 { myLabelNode = NULL; }
 
diff --git a/src/XCAFDoc/XCAFDoc_Color.cdl b/src/XCAFDoc/XCAFDoc_Color.cdl
index 55fa653e01..5f73b14bfb 100755
--- a/src/XCAFDoc/XCAFDoc_Color.cdl
+++ b/src/XCAFDoc/XCAFDoc_Color.cdl
@@ -64,6 +64,7 @@ is
     Set (me : mutable;  R,G,B : Real from Standard);
 		    
     GetColor (me) returns Color from Quantity;
+        ---C++: return const & 
 
     GetNOC (me) returns NameOfColor from Quantity;
 	     
diff --git a/src/XCAFDoc/XCAFDoc_Color.cxx b/src/XCAFDoc/XCAFDoc_Color.cxx
index 652d38da4c..9619957057 100755
--- a/src/XCAFDoc/XCAFDoc_Color.cxx
+++ b/src/XCAFDoc/XCAFDoc_Color.cxx
@@ -135,7 +135,7 @@ void XCAFDoc_Color::Set(const Quantity_Color& C)
 //purpose  : 
 //=======================================================================
 
- Quantity_Color XCAFDoc_Color::GetColor() const
+const Quantity_Color& XCAFDoc_Color::GetColor() const
 {
   return myColor;
 }
diff --git a/src/XCAFDoc/XCAFDoc_ColorTool.cdl b/src/XCAFDoc/XCAFDoc_ColorTool.cdl
index e1732649e4..977f7a24c2 100755
--- a/src/XCAFDoc/XCAFDoc_ColorTool.cdl
+++ b/src/XCAFDoc/XCAFDoc_ColorTool.cdl
@@ -123,7 +123,7 @@ is
     	---Purpose: Returns True if label <L> has a color assignment 
     	--          of the type <type>
     
-    GetColor (me: mutable; L: Label from TDF;
+    GetColor (myclass; L: Label from TDF;
 		  type : ColorType from XCAFDoc;
     	    	  colorL: out Label from TDF) returns Boolean;
         ---Purpose: Returns label with color assigned to <L> as <type>
diff --git a/src/XCAFDoc/XCAFDoc_Location.cdl b/src/XCAFDoc/XCAFDoc_Location.cdl
index 82e32c4d02..56b17466a0 100755
--- a/src/XCAFDoc/XCAFDoc_Location.cdl
+++ b/src/XCAFDoc/XCAFDoc_Location.cdl
@@ -50,6 +50,7 @@ is
     
     Get (me)
     returns Location from TopLoc;
+        ---C++: return const & 
 
     --IsCaptured(me) returns Boolean;
 	---Purpose: Returns True if there is a reference on the same label
diff --git a/src/XCAFDoc/XCAFDoc_Location.cxx b/src/XCAFDoc/XCAFDoc_Location.cxx
index 9ef3dd46da..a08d7df3df 100755
--- a/src/XCAFDoc/XCAFDoc_Location.cxx
+++ b/src/XCAFDoc/XCAFDoc_Location.cxx
@@ -73,7 +73,7 @@ const Standard_GUID& XCAFDoc_Location::GetID()
 //purpose  : 
 //=======================================================================
 
- TopLoc_Location XCAFDoc_Location::Get() const
+const TopLoc_Location& XCAFDoc_Location::Get() const
 {
   return myLocation;
 }