diff --git a/core/config/schema/core.data_types.schema.yml b/core/config/schema/core.data_types.schema.yml
index ca2506f..50d0237 100644
--- a/core/config/schema/core.data_types.schema.yml
+++ b/core/config/schema/core.data_types.schema.yml
@@ -120,10 +120,11 @@ action_configuration_default:
   sequence:
     - type: string
 
-# Theme settings schema is automatically applied to a theme's *.settings
-# configuration unless the theme provides its own schema. Static analysis of
-# configuration objects using schema will have to duplicate the
-# system_config_schema_info_alter() to determine a theme's *.settings schema.
+# Theme settings schema is automatically applied to a theme's
+# THEME_NAME.settings configuration unless the theme provides its own schema.
+# Static analysis of configuration objects using schema will have to duplicate
+# the system_config_schema_info_alter() to determine a theme's
+# THEME_NAME.settings schema.
 theme_settings:
   type: mapping
   mapping:
diff --git a/core/lib/Drupal/Core/Config/ConfigInstaller.php b/core/lib/Drupal/Core/Config/ConfigInstaller.php
index 17d3a07..72ae554 100644
--- a/core/lib/Drupal/Core/Config/ConfigInstaller.php
+++ b/core/lib/Drupal/Core/Config/ConfigInstaller.php
@@ -90,11 +90,9 @@ public function __construct(ConfigFactoryInterface $config_factory, StorageInter
    */
   public function installDefaultConfig($type, $name) {
     $extension_path = drupal_get_path($type, $name);
-    // If the extension provides configuration schema or is a theme clear the
-    // definitions.
+    // Refresh the schema cache if the extension provides configuration schema
+    // or is a theme.
     if (is_dir($extension_path . '/' . InstallStorage::CONFIG_SCHEMA_DIRECTORY) || $type == 'theme') {
-      // Refresh the schema cache if installing default configuration and the
-      // extension has a configuration schema directory.
       $this->typedConfig->clearCachedDefinitions();
     }
 
diff --git a/core/modules/shortcut/config/schema/shortcut.schema.yml b/core/modules/shortcut/config/schema/shortcut.schema.yml
index 014b67c..7d9420b 100644
--- a/core/modules/shortcut/config/schema/shortcut.schema.yml
+++ b/core/modules/shortcut/config/schema/shortcut.schema.yml
@@ -18,4 +18,4 @@ theme_settings.third_party.shortcut:
   mapping:
     module_link:
       type: boolean
-      label: 'Add link'
+      label: 'Add shortcut link'
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 15628a6..beeb56a 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -1328,7 +1328,7 @@ function system_path_delete($path) {
  */
 function system_config_schema_info_alter(&$definitions) {
   // Provide a default schema for all theme settings files if the theme does
-  // provide its own schema already..
+  // provide its own schema already.
   foreach (\Drupal::service('theme_handler')->listInfo(TRUE) as $name => $theme) {
     $config_name = $name . '.settings';
     if (!isset($definitions[$config_name])) {