diff --git a/application/Espo/Core/Entities/Person.php b/application/Espo/Core/Entities/Person.php
index b5631f88b9..6a426f873d 100644
--- a/application/Espo/Core/Entities/Person.php
+++ b/application/Espo/Core/Entities/Person.php
@@ -99,11 +99,13 @@ class Person extends Entity
 
     public function getEmailAddressGroup(): EmailAddressGroup
     {
+        /** @var EmailAddressGroup */
         return $this->getValueObject('emailAddress');
     }
 
     public function getPhoneNumberGroup(): PhoneNumberGroup
     {
+        /** @var PhoneNumberGroup */
         return $this->getValueObject('phoneNumber');
     }
 
@@ -164,6 +166,7 @@ class Person extends Entity
 
     public function getAddress(): Address
     {
+        /** @var Address */
         return $this->getValueObject('address');
     }
 
diff --git a/application/Espo/Core/EntryPoint/EntryPointManager.php b/application/Espo/Core/EntryPoint/EntryPointManager.php
index 00eeac2bed..c1f465e088 100644
--- a/application/Espo/Core/EntryPoint/EntryPointManager.php
+++ b/application/Espo/Core/EntryPoint/EntryPointManager.php
@@ -100,10 +100,11 @@ class EntryPointManager
     }
 
     /**
-     * @return ?class-string
+     * @return ?class-string<EntryPoint>
      */
     private function getClassName(string $name): ?string
     {
+        /** @var ?class-string<EntryPoint> */
         return $this->classFinder->find('EntryPoints', ucfirst($name));
     }
 }