diff --git a/core/includes/config.inc b/core/includes/config.inc
index 733ddfc..4c5d32b 100644
--- a/core/includes/config.inc
+++ b/core/includes/config.inc
@@ -303,16 +303,16 @@ function config_sync_get_changes(StorageInterface $source_storage, StorageInterf
  *     .label: 'Style effects'
  *     .list:
  *       .label: 'Image effect'
- *      weight:
- *        .label: 'Weight'
- *        .type: integer
- *      ieid:
- *        .label: 'IEID'
- *      name:
- *        .label: 'Machine name'
- *      data:
- *        .include: 'image.effect.[%parent.name]'
- *        .label: 'Data'
+ *       weight:
+ *         .label: 'Weight'
+ *         .type: integer
+ *       ieid:
+ *         .label: 'IEID'
+ *       name:
+ *         .label: 'Machine name'
+ *       data:
+ *         .include: 'image.effect.[%parent.name]'
+ *         .label: 'Data'
  * @endcode
  *
  * For this example, for each image effect, we have the metadata under the
@@ -334,14 +334,14 @@ function config_sync_get_changes(StorageInterface $source_storage, StorageInterf
  * For example here is meta/image.effect.image_scale.yml:
  * @code
  *   width:
- *    .label: 'Width'
- *    .type: integer
- *  height:
- *    .label: 'Height'
- *    .type: integer
- *  upscale:
- *    .label: 'Upscale'
- *    .type: boolean
+ *     .label: 'Width'
+ *     .type: integer
+ *   height:
+ *     .label: 'Height'
+ *     .type: integer
+ *   upscale:
+ *     .label: 'Upscale'
+ *     .type: boolean
  * @endcode
  *
  * @param string $name
diff --git a/core/lib/Drupal/Core/Config/Metadata/ElementBase.php b/core/lib/Drupal/Core/Config/Metadata/ElementBase.php
index c42dcb0..3c31b8d 100644
--- a/core/lib/Drupal/Core/Config/Metadata/ElementBase.php
+++ b/core/lib/Drupal/Core/Config/Metadata/ElementBase.php
@@ -146,7 +146,7 @@ public function getMetadata() {
   /**
    * Implements \Drupal\Core\Config\Metadata\ElementInterface::setMetadata().
    */
-  public function setMetadata($metadata) {
+  public function setMetadata(array $metadata) {
     $this->metadata = $metadata;
   }
 
diff --git a/core/modules/locale/lib/Drupal/locale/LocaleTypedConfig.php b/core/modules/locale/lib/Drupal/locale/LocaleTypedConfig.php
index 11629e0..23f89ee 100644
--- a/core/modules/locale/lib/Drupal/locale/LocaleTypedConfig.php
+++ b/core/modules/locale/lib/Drupal/locale/LocaleTypedConfig.php
@@ -72,8 +72,8 @@ public function __construct($name, array $data, StringStorageInterface $localeSt
    * @param \Drupal\locale\LocaleTypedConfig $source
    *   Configuration wrapper object used as translation source.
    *
-   * @return \Drupal\locale\StringStorageInterface
-   *   The storage interface object.
+   * @return \Drupal\locale\LocaleTypedConfig
+   *   The called object.
    */
   public function setTranslation($langcode, LocaleTypedConfig $source) {
     $this->translationLangcode = $langcode;
diff --git a/core/modules/locale/locale.bulk.inc b/core/modules/locale/locale.bulk.inc
index 5e7cd18..391631f 100644
--- a/core/modules/locale/locale.bulk.inc
+++ b/core/modules/locale/locale.bulk.inc
@@ -750,14 +750,14 @@ function locale_config_batch_build(array $names, array $langcodes, array $option
 /**
  * Refreshes the configuration translation as a batch step.
  *
- * @param array $name
- *   Name of configuration object to update, which is an array.
+ * @param string $name
+ *   Name of configuration object to update.
  * @param array $langcodes
  *   (optional) Array of language codes to update. Defaults to all languages.
  * @param array $context
  *   An array that contains a list of files imported.
  */
-function locale_config_batch_refresh_name(array $name, array $langcodes, array &$context) {
+function locale_config_batch_refresh_name($name, array $langcodes, array &$context) {
   if (!isset($context['result']['stats']['configuration'])) {
     $context['result']['stats']['configuration'] = 0;
   }
@@ -822,8 +822,7 @@ function locale_config_update_multiple(array $names, array $langcodes = array())
   foreach ($names as $name) {
     $wrapper = NULL;
     try {
-      if ($data = $default_storage->read($name)) {
-        $updated = $config_storage->read($name);
+      if (($data = $default_storage->read($name)) && ($updated = $config_storage->read($name))) {
         if ($data = _locale_config_data_compare($data, $updated)) {
           $wrapper = new LocaleTypedConfig($name, $data, locale_storage());
         }
@@ -925,7 +924,7 @@ function _locale_config_component_names(array $components) {
  * Gets the configuration names associated with strings.
  *
  * @param array $lids
- *   An array with location string identifiers.
+ *   An array with string identifiers.
  *
  * @return array
  *   An array of configuration object names.