diff --git a/application/Espo/Core/Authentication/Login/LDAP.php b/application/Espo/Core/Authentication/Login/LDAP.php
index 63d326ab70..b32b7c4b12 100644
--- a/application/Espo/Core/Authentication/Login/LDAP.php
+++ b/application/Espo/Core/Authentication/Login/LDAP.php
@@ -121,7 +121,9 @@ class LDAP extends Espo
             }
         }
 
-        if (!$password || $username == '**logout') return;
+        if (!$password || $username == '**logout') {
+            return Result::fail();
+        }
 
         if ($isPortal) {
             $useLdapAuthForPortalUser = $this->utils->getOption('portalUserLdapAuth');
diff --git a/application/Espo/Core/ORM/Repository.php b/application/Espo/Core/ORM/Repository.php
index e352fc2b88..c24cb19161 100644
--- a/application/Espo/Core/ORM/Repository.php
+++ b/application/Espo/Core/ORM/Repository.php
@@ -31,10 +31,15 @@ namespace Espo\Core\ORM;
 
 use Espo\Core\Interfaces\Injectable;
 
-use Espo\ORM\EntityFactory;
+use Espo\ORM\{
+    EntityFactory,
+    Repository\RDBRepository as RDBRepository,
+};
 
-/** @deprecated */
-abstract class Repository extends \Espo\ORM\Repository implements Injectable
+/**
+ * @deprecated
+ */
+abstract class Repository extends RDBRepository implements Injectable
 {
     protected $dependencyList = [];
 
diff --git a/application/Espo/ORM/DB/Query/Base.php b/application/Espo/ORM/DB/Query/Base.php
index c3e85ec993..3a465183fb 100644
--- a/application/Espo/ORM/DB/Query/Base.php
+++ b/application/Espo/ORM/DB/Query/Base.php
@@ -32,7 +32,7 @@ namespace Espo\ORM\DB\Query;
 /**
  * @deprecated
  */
-abstract class Base extends Espo\ORM\QueryComposer\BaseQueryComposer
+abstract class Base extends \Espo\ORM\QueryComposer\BaseQueryComposer
 {
 
 }