diff --git a/DataStorage/Database/Mapper/ReadMapper.php b/DataStorage/Database/Mapper/ReadMapper.php
index c145d9752..38c4dae43 100644
--- a/DataStorage/Database/Mapper/ReadMapper.php
+++ b/DataStorage/Database/Mapper/ReadMapper.php
@@ -306,8 +306,8 @@ final class ReadMapper extends DataMapperAbstract
     /**
      * Get mapper specific builder
      *
-     * @param null|Builder $query   Query to fill
-     * @param array        $columns Columns to use
+     * @param Builder $query   Query to fill
+     * @param array   $columns Columns to use
      *
      * @return Builder
      *
@@ -843,7 +843,7 @@ final class ReadMapper extends DataMapperAbstract
                     ->from($many['table'])
                     ->where($many['table'] . '.' . $many['self'], '=', $primaryKey);
 
-                if ($many['mapper']::TABLE !== $many['table']) {
+                if ($many['table'] !== $many['mapper']::TABLE) {
                     $query->leftJoin($many['mapper']::TABLE)
                         ->on($many['table'] . '.' . $src, '=', $many['mapper']::TABLE . '.' . $many['mapper']::PRIMARYFIELD);
                 }
diff --git a/DataStorage/Database/Mapper/UpdateMapper.php b/DataStorage/Database/Mapper/UpdateMapper.php
index 90a945aa2..4a6304e95 100644
--- a/DataStorage/Database/Mapper/UpdateMapper.php
+++ b/DataStorage/Database/Mapper/UpdateMapper.php
@@ -330,7 +330,7 @@ final class UpdateMapper extends DataMapperAbstract
                 ->from($many['table'])
                 ->where($many['table'] . '.' . $many['self'], '=', $objId);
 
-            if ($many['mapper']::TABLE !== $many['table']) {
+            if ($many['table'] !== $many['mapper']::TABLE) {
                 $query->leftJoin($many['mapper']::TABLE)
                     ->on($many['table'] . '.' . $src, '=', $many['mapper']::TABLE . '.' . $many['mapper']::PRIMARYFIELD);
             }
diff --git a/Message/Mail/Email.php b/Message/Mail/Email.php
index a7f0b3fef..fb5bf342c 100644
--- a/Message/Mail/Email.php
+++ b/Message/Mail/Email.php
@@ -895,7 +895,7 @@ class Email implements MessageInterface
 
         $errorcode = 0;
         if (\defined('INTL_IDNA_VARIANT_UTS46')) {
-            $punycode = \idn_to_ascii($domain, $errorcode, INTL_IDNA_VARIANT_UTS46);
+            $punycode = \idn_to_ascii($domain, $errorcode, \INTL_IDNA_VARIANT_UTS46);
         } else {
             $punycode = \idn_to_ascii($domain, $errorcode);
         }