diff --git a/application/itopwebpage.class.inc.php b/application/itopwebpage.class.inc.php
index 18d63b37f..3c4ffd308 100644
--- a/application/itopwebpage.class.inc.php
+++ b/application/itopwebpage.class.inc.php
@@ -702,6 +702,10 @@ JS
 		);
 	}
 
+	/**
+	 * @inheritDoc
+	 * @throws \Exception
+	 */
 	protected function LoadTheme()
 	{
 		// TODO: Remove light-grey when development of Full Moon is done.
@@ -1787,7 +1791,6 @@ EOF;
 		}
 	}
 
-
 	/**
 	 * Adds in the page a container with the header_message CSS class
 	 *
diff --git a/application/menunode.class.inc.php b/application/menunode.class.inc.php
index 1bcbe3ce3..b25a02a9c 100644
--- a/application/menunode.class.inc.php
+++ b/application/menunode.class.inc.php
@@ -247,6 +247,7 @@ class ApplicationMenu
 	 *
 	 * @return array
 	 * @throws \DictExceptionMissingString
+	 * @throws \Exception
 	 * @since 2.8.0
 	 */
 	public static function GetSubMenuNodes($sMenuGroupIdx, $aExtraParams = array())
@@ -658,7 +659,6 @@ abstract class MenuNode
 
 	/**
 	 * @return string
-	 * @throws DictExceptionMissingString
 	 */
 	public function GetTitle()
 	{
@@ -667,7 +667,6 @@ abstract class MenuNode
 
 	/**
 	 * @return string
-	 * @throws DictExceptionMissingString
 	 */
 	public function GetLabel()
 	{
diff --git a/application/webpage.class.inc.php b/application/webpage.class.inc.php
index d6bb972de..1af31dfdd 100644
--- a/application/webpage.class.inc.php
+++ b/application/webpage.class.inc.php
@@ -848,6 +848,11 @@ class WebPage implements Page
 		}
 	}
 
+	/**
+	 * Return the HTML base tag
+	 *
+	 * @return string
+	 */
 	protected function get_base_tag()
 	{
 		$sTag = '';
diff --git a/datamodels/2.x/itop-hub-connector/menus.php b/datamodels/2.x/itop-hub-connector/menus.php
index 0d4b8753a..b6754d5ef 100644
--- a/datamodels/2.x/itop-hub-connector/menus.php
+++ b/datamodels/2.x/itop-hub-connector/menus.php
@@ -1,6 +1,19 @@
 <?php
+
+/**
+ * Class ItopHubMenusHandler
+ *
+ * @author Denis Flaven <denis.flaven@combodo.com>
+ * @since 2.4.1
+ */
 class ItopHubMenusHandler extends ModuleHandlerAPI
 {
+	/**
+	 * iTop Hub menus are defined in PHP instead of XML to avoid people overloading them through a delta.
+	 * Do NOT refactor them to the XML.
+	 *
+	 * @throws \Exception
+	 */
 	public static function OnMenuCreation()
 	{
 		// Add the admin menus