diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Model/Account.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Model/Account.php
index 564cff90f..505468c7e 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Model/Account.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Model/Account.php
@@ -49,9 +49,8 @@ class Account
 	 */
 	private $sParentEmail;
 
-	function __construct(string $sEmail, string $sLogin, string $sPassword,
-		\RainLoop\Model\Domain $oDomain, string $sSignMeToken = '', string $sProxyAuthUser = '',
-		string $sProxyAuthPassword = '', string $sClientCert = '')
+	function __construct(string $sEmail, string $sLogin, string $sPassword, Domain $oDomain,
+		string $sSignMeToken = '', string $sProxyAuthUser = '', string $sProxyAuthPassword = '', string $sClientCert = '')
 	{
 		$this->sEmail = \MailSo\Base\Utils::IdnToAscii($sEmail, true);
 		$this->sLogin = \MailSo\Base\Utils::IdnToAscii($sLogin);
@@ -146,7 +145,7 @@ class Account
 		return $this->sSignMeToken;
 	}
 
-	public function Domain() : \RainLoop\Model\Domain
+	public function Domain() : Domain
 	{
 		return $this->oDomain;
 	}
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Model/Domain.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Model/Domain.php
index 33bbf8974..5cb635245 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Model/Domain.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Model/Domain.php
@@ -128,7 +128,7 @@ class Domain
 		$this->sAliasName = '';
 	}
 
-	public static function NewInstanceFromDomainConfigArray(string $sName, array $aDomain) : ?\RainLoop\Model\Domain
+	public static function NewInstanceFromDomainConfigArray(string $sName, array $aDomain) : ?self
 	{
 		$oDomain = null;
 
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Plugins/Helper.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Plugins/Helper.php
index 8e10668c5..8776eab83 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Plugins/Helper.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Plugins/Helper.php
@@ -4,10 +4,6 @@ namespace RainLoop\Plugins;
 
 class Helper
 {
-	function __construct()
-	{
-	}
-
 	static public function ValidateWildcardValues(string $sString, string $sWildcardValues, string &$sFoundedValue) : bool
 	{
 		$sFoundedValue = '';