diff --git a/application/Espo/Core/Authentication/TwoFactor/Totp/TotpLogin.php b/application/Espo/Core/Authentication/TwoFactor/Totp/TotpLogin.php
index 61f480ce9b..472aab393d 100644
--- a/application/Espo/Core/Authentication/TwoFactor/Totp/TotpLogin.php
+++ b/application/Espo/Core/Authentication/TwoFactor/Totp/TotpLogin.php
@@ -107,6 +107,9 @@ class TotpLogin implements Login
 
     private function getUserDataRepository(): UserDataRepository
     {
-        return $this->entityManager->getRepository(UserData::ENTITY_TYPE);
+        /** @var UserDataRepository $repository */
+        $repository = $this->entityManager->getRepository(UserData::ENTITY_TYPE);
+
+        return $repository;
     }
 }
diff --git a/application/Espo/Core/Authentication/TwoFactor/Totp/TotpUserSetup.php b/application/Espo/Core/Authentication/TwoFactor/Totp/TotpUserSetup.php
index b42dbefe05..0cc746f2ff 100644
--- a/application/Espo/Core/Authentication/TwoFactor/Totp/TotpUserSetup.php
+++ b/application/Espo/Core/Authentication/TwoFactor/Totp/TotpUserSetup.php
@@ -49,9 +49,6 @@ class TotpUserSetup implements UserSetup
 
     private $config;
 
-    /**
-     * @var EntityManager
-     */
     private $entityManager;
 
     public function __construct(Util $totp, Config $config, EntityManager $entityManager)
@@ -113,6 +110,9 @@ class TotpUserSetup implements UserSetup
 
     private function getUserDataRepository(): UserDataRepository
     {
-        return $this->entityManager->getRepository(UserData::ENTITY_TYPE);
+        /** @var UserDataRepository $repository */
+        $repository = $this->entityManager->getRepository(UserData::ENTITY_TYPE);
+
+        return $repository;
     }
 }
diff --git a/application/Espo/Core/Controllers/RecordBase.php b/application/Espo/Core/Controllers/RecordBase.php
index a5e15d2993..58743dcfab 100644
--- a/application/Espo/Core/Controllers/RecordBase.php
+++ b/application/Espo/Core/Controllers/RecordBase.php
@@ -59,9 +59,10 @@ use Espo\ORM\EntityManager;
 
 use stdClass;
 
-class RecordBase extends Base implements Di\EntityManagerAware
+class RecordBase extends Base implements Di\EntityManagerAware, Di\InjectableFactoryAware
 {
     use Di\EntityManagerSetter;
+    use Di\InjectableFactorySetter;
 
     public static $defaultAction = 'list';
 
@@ -247,7 +248,7 @@ class RecordBase extends Base implements Di\EntityManagerAware
     {
         if (method_exists($this, 'actionDelete')) {
             // For backward compatibility.
-            return (object) $this->actionDelete($request->getRouteParams(), $request->getParsedBody(), $request);
+            return $this->actionDelete($request->getRouteParams(), $request->getParsedBody(), $request);
         }
 
         $id = $request->getRouteParam('id');
diff --git a/application/Espo/Core/Controllers/RecordTree.php b/application/Espo/Core/Controllers/RecordTree.php
index 39c7e725b6..bdb8acbc5a 100644
--- a/application/Espo/Core/Controllers/RecordTree.php
+++ b/application/Espo/Core/Controllers/RecordTree.php
@@ -83,6 +83,10 @@ class RecordTree extends Record
 
     protected function getRecordTreeService(): Service
     {
-        return $this->getRecordService();
+        $service = $this->getRecordService();
+
+        assert($service instanceof Service);
+
+        return $service;
     }
 }