diff --git a/core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php b/core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php
index a95b053..eb03a68 100644
--- a/core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php
+++ b/core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php
@@ -153,12 +153,12 @@ protected function buildPropertyQuery(QueryInterface $entity_query, array $value
    *
    * @param array|null $ids
    *   An array of entity IDs, or NULL to load all entities.
-   * @param $revision_id
+   * @param integer|FALSE $revision_id
    *   The ID of the revision to load, or FALSE if this query is asking for the
    *   most current revision(s).
    *
-   * @return SelectQuery
-   *   A SelectQuery object for loading the entity.
+   * @return \Drupal\Core\Database\Query\Select
+   *   A Select query object for loading the entity.
    */
   protected function buildQuery($ids, $revision_id = FALSE) {
     $query = db_select($this->entityInfo['base_table'], 'base');
@@ -295,6 +295,11 @@ protected function mapFromStorageRecords(array $records, $load_revision = FALSE)
 
   /**
    * Attaches property data in all languages for translatable properties.
+   *
+   * @param array $queried_entities
+   *   Associative array of entities, keyed on the entity ID.
+   * @param boolean $load_revision
+   *   (optional) TRUE if the revision should be loaded, defaults to FALSE.
    */
   protected function attachPropertyData(&$queried_entities, $load_revision = FALSE) {
     if ($this->dataTable) {
@@ -404,7 +409,7 @@ public function save(EntityInterface $entity) {
   /**
    * Saves an entity revision.
    *
-   * @param Drupal\Core\Entity\EntityInterface $entity
+   * @param \Drupal\Core\Entity\EntityInterface $entity
    *   The entity object.
    *
    * @return integer
@@ -442,7 +447,7 @@ protected function saveRevision(EntityInterface $entity) {
   /**
    * Saves the entity property data language aware.
    *
-   * @param Drupal\Core\Entity\EntityInterface $entity
+   * @param \Drupal\Core\Entity\EntityInterface $entity
    *   The entity object.
    */
   protected function saveData(EntityInterface $entity) {
@@ -492,6 +497,12 @@ protected function invokeHook($hook, EntityInterface $entity) {
 
   /**
    * Maps from an entity object to the storage record of the base table.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity object.
+   *
+   * @return \stdClass
+   *   The record to store.
    */
   protected function mapToStorageRecord(EntityInterface $entity) {
     $record = new \stdClass();
@@ -503,6 +514,12 @@ protected function mapToStorageRecord(EntityInterface $entity) {
 
   /**
    * Maps from an entity object to the storage record of the revision table.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity object.
+   *
+   * @return \stdClass
+   *   The record to store.
    */
   protected function mapToRevisionStorageRecord(EntityInterface $entity) {
     $record = new \stdClass();
@@ -515,6 +532,14 @@ protected function mapToRevisionStorageRecord(EntityInterface $entity) {
 
   /**
    * Maps from an entity object to the storage record of the data table.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity object.
+   * @param $langcode
+   *   The language code of the translation to get.
+   *
+   * @return \stdClass
+   *   The record to store.
    */
   protected function mapToDataStorageRecord(EntityInterface $entity, $langcode) {
     $default_langcode = $entity->language()->langcode;