diff --git a/core/lib/Drupal/Core/Entity/EntityAutocompleteMatcher.php b/core/lib/Drupal/Core/Entity/EntityAutocompleteMatcher.php
index 79ef17f..3e350b0 100644
--- a/core/lib/Drupal/Core/Entity/EntityAutocompleteMatcher.php
+++ b/core/lib/Drupal/Core/Entity/EntityAutocompleteMatcher.php
@@ -50,7 +50,7 @@ public function __construct(SelectionPluginManagerInterface $selection_manager)
    *   autocomplete API (e.g. array('value' => $value, 'label' => $label)).
    *
    * @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
-   *   Thrown when the current user doesn't have access to the specifies entity.
+   *   Thrown when the current user doesn't have access to the specified entity.
    *
    * @see \Drupal\system\Controller\EntityAutocompleteController
    */
diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/Query.php b/core/lib/Drupal/Core/Entity/Query/Sql/Query.php
index b185bec..df39aab 100644
--- a/core/lib/Drupal/Core/Entity/Query/Sql/Query.php
+++ b/core/lib/Drupal/Core/Entity/Query/Sql/Query.php
@@ -96,7 +96,7 @@ public function execute() {
    *   Returns the called object.
    *
    * @throws \Drupal\Core\Entity\Query\QueryException
-   *   Thrown if the base table does not exists.
+   *   Thrown if the base table does not exist.
    */
   protected function prepare() {
     if ($this->allRevisions) {
diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php b/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
index 9d8f4f8..5fe7dec 100644
--- a/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
+++ b/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
@@ -234,9 +234,23 @@ public function isFieldCaseSensitive($field_name) {
   /**
    * Join entity table if necessary and return the alias for it.
    *
+   * @param string $index_prefix
+   *   Index to prefix with the table name.
    * @param string $property
+   *   Mapped field table name.
+   * @param string $type
+   *   Join type, can either be INNER or LEFT.
+   * @param string $langcode
+   *   Language code.
+   * @param string $base_table
+   *   Base table name.
+   * @param string $id_field
+   *   Field name.
+   * @param array $entity_tables
+   *   Array of data tables, or the base tables.
    *
    * @return string
+   *   The table alias.
    *
    * @throws \Drupal\Core\Entity\Query\QueryException
    */
@@ -255,9 +269,24 @@ protected function ensureEntityTable($index_prefix, $property, $type, $langcode,
   /**
    * Join field table if necessary.
    *
-   * @param $field_name
-   *   Name of the field.
+   * @param string $index_prefix
+   *   Index to prefix with the table name.
+   * @param object $field
+   *   A field object.
+   * @param string $type
+   *   Join type, can either be INNER or LEFT.
+   * @param string $langcode
+   *   Language code.
+   * @param string $base_table
+   *   Base table name.
+   * @param string $entity_id_field
+   *   Field name.
+   * @param array $field_id_field
+   *   Field name.
+   *
    * @return string
+   *   The table alias.
+   *
    * @throws \Drupal\Core\Entity\Query\QueryException
    */
   protected function ensureFieldTable($index_prefix, &$field, $type, $langcode, $base_table, $entity_id_field, $field_id_field) {