diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Controller/CustomBlockController.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Controller/CustomBlockController.php
index 13469bf..a3e6aac 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/Controller/CustomBlockController.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Controller/CustomBlockController.php
@@ -105,7 +105,7 @@ public function addForm(CustomBlockTypeInterface $custom_block_type, Request $re
     if (($theme = $request->attributes->get('theme')) && in_array($theme, array_keys(list_themes()))) {
       // We have navigated to this page from the block library and will keep track
       // of the theme for redirecting the user to the configuration page for the
-      // newly created b  lock in the given theme.
+      // newly created block in the given theme.
       $block->setTheme($theme);
     }
     return $this->entityManager->getForm($block);
diff --git a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php b/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php
index 2c0481e..bf6719e 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php
@@ -130,7 +130,7 @@ public function generateBlockInstanceID(EntityStorageControllerInterface $manage
      $block_ids = array_map(function ($block_id) {
        $parts = explode('.', $block_id);
        return end($parts);
-     }, array_keys($manager->load()));
+     }, array_keys($manager->loadMultiple()));
 
      // Iterate through potential IDs until we get a new one. E.g.
      // 'views_block__MYVIEW_PAGE_1_2'