diff --git a/core/modules/views/src/Plugin/Block/ViewsBlock.php b/core/modules/views/src/Plugin/Block/ViewsBlock.php
index 1aa8a65..ff9859a 100644
--- a/core/modules/views/src/Plugin/Block/ViewsBlock.php
+++ b/core/modules/views/src/Plugin/Block/ViewsBlock.php
@@ -36,8 +36,10 @@ public function build() {
             }
             $args[$argument_name] = $value;
           }
-          elseif ($argument->options['default_action'] == 'ignore') {
-            $args[$argument_name] = $argument->options['exception']['value'];
+          elseif ($argument_default = $argument->getPlugin('argument_default')) {
+            if ($argument_default_value = $argument_default->getArgument()) {
+              $args[$argument_name] = $argument_default->getArgument();
+            }
           }
         }
       }
diff --git a/core/modules/views/src/Plugin/views/argument_validator/Entity.php b/core/modules/views/src/Plugin/views/argument_validator/Entity.php
index 60eb51c..bec60ac 100644
--- a/core/modules/views/src/Plugin/views/argument_validator/Entity.php
+++ b/core/modules/views/src/Plugin/views/argument_validator/Entity.php
@@ -234,9 +234,7 @@ public function calculateDependencies() {
    * {@inheritdoc}
    */
   public function getContextDefinition() {
-    // The plugin ID is entity:<entity_type>, which is the same as the typed
-    // data type for entity types.
-    return new ContextDefinition($this->getPluginId(), $this->argument->adminLabel(), FALSE);
+    return new ContextDefinition('entity:' . $this->definition['entity_type'], $this->argument->adminLabel(), FALSE);
   }
 
 }