diff --git a/core/metamodel.class.php b/core/metamodel.class.php
index 6769f2b44..31a25a7dc 100644
--- a/core/metamodel.class.php
+++ b/core/metamodel.class.php
@@ -1404,7 +1404,7 @@ abstract class MetaModel
 	 * @param string $sClass Class name
 	 * @param string $sAttCode Attribute code
 	 *
-	 * @return AttributeDefinition the AttributeDefinition of the $sAttCode attribute of the $sClass class
+	 * @return \AttributeDefinition the AttributeDefinition of the $sAttCode attribute of the $sClass class
 	 * @throws Exception
 	 */
 	final static public function GetAttributeDef($sClass, $sAttCode)
@@ -2696,6 +2696,7 @@ abstract class MetaModel
 	 */
 	public static function GetAllowedValuesAsObjectSet($sClass, $sAttCode, $aArgs = array(), $sContains = '', $iAdditionalValue = null)
 	{
+		/** @var \AttributeExternalKey $oAttDef */
 		$oAttDef = self::GetAttributeDef($sClass, $sAttCode);
 		return $oAttDef->GetAllowedValuesAsObjectSet($aArgs, $sContains, $iAdditionalValue);
 	}
diff --git a/sources/renderer/fieldrenderer.class.inc.php b/sources/renderer/fieldrenderer.class.inc.php
index 3a06d146a..6655004fb 100644
--- a/sources/renderer/fieldrenderer.class.inc.php
+++ b/sources/renderer/fieldrenderer.class.inc.php
@@ -19,8 +19,8 @@
 
 namespace Combodo\iTop\Renderer;
 
-use Dict;
 use Combodo\iTop\Form\Field\Field;
+use Dict;
 
 /**
  * Description of FieldRenderer
@@ -29,7 +29,9 @@ use Combodo\iTop\Form\Field\Field;
  */
 abstract class FieldRenderer
 {
+	/** @var \Combodo\iTop\Form\Field\Field */
 	protected $oField;
+	/** @var string */
 	protected $sEndpoint;
 
 	/**