diff --git a/core/designdocument.class.inc.php b/core/designdocument.class.inc.php
index 5b9207a04..bf9386a15 100644
--- a/core/designdocument.class.inc.php
+++ b/core/designdocument.class.inc.php
@@ -70,6 +70,9 @@ class DesignDocument extends DOMDocument
 		$this->preserveWhiteSpace = true; // otherwise the formatOutput option would have no effect
 	}
 
+	/**
+	 * @inheritDoc
+	 */
 	public function loadXML(string $source, int $options = 0): bool
 	{
 		return parent::loadXML($source, $options | LIBXML_BIGLINES);
diff --git a/setup/modelfactory.class.inc.php b/setup/modelfactory.class.inc.php
index c48d29783..3ce0d878b 100644
--- a/setup/modelfactory.class.inc.php
+++ b/setup/modelfactory.class.inc.php
@@ -71,14 +71,14 @@ class MFException extends Exception
 	 *
 	 * @inheritDoc
 	 *
-	 * @param $message
-	 * @param $code: error code
-	 * @param $oNode: dom node
-	 * @param $sXPath: XML xpath: if provided used in exception message. otherwise computed via $oNode
-	 * @param $sExtraInfo: additional information stored in exception
-	 * @param $oParentFallbackNode: fallback dom node (usually parent). in case $oNode XML line is wrong (set to 0), line number computed/displayed in error message comes from $oParentFallbackNode
+	 * @param string $message
+	 * @param int $code: error code
+	 * @param DesignElement $oNode: dom node
+	 * @param string|null $sXPath: XML xpath: if provided used in exception message. otherwise computed via $oNode
+	 * @param string $sExtraInfo: additional information stored in exception
+	 * @param DesignElement|null $oParentFallbackNode: fallback dom node (usually parent). in case $oNode XML line is wrong (set to 0), line number computed/displayed in error message comes from $oParentFallbackNode
 	 */
-	public function __construct($message = null, $code = 0, $oNode, $sXPath = null, $sExtraInfo = '', $oParentFallbackNode = null)
+	public function __construct(string $message, int $code, DesignElement $oNode, ?string $sXPath = null, string $sExtraInfo = '', ?DesignElement $oParentFallbackNode = null)
 	{
 		$iSourceLineNumber = ModelFactory::GetXMLLineNumber($oNode);
 		if ($iSourceLineNumber == 0 && ! is_null($oParentFallbackNode)) {