diff --git a/config/optional/views.view.locked_content.yml b/config/optional/views.view.locked_content.yml
index 9362590..c94277f 100644
--- a/config/optional/views.view.locked_content.yml
+++ b/config/optional/views.view.locked_content.yml
@@ -12,7 +12,6 @@ description: ''
 tag: ''
 base_table: node_field_data
 base_field: nid
-core: 8.x
 display:
   default:
     display_plugin: default
@@ -440,6 +439,8 @@ display:
             multiple: false
             remember_roles:
               authenticated: authenticated
+            operator_limit_selection: false
+            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -480,6 +481,8 @@ display:
               editor: '0'
               seo: '0'
               administrator: '0'
+            operator_limit_selection: false
+            operator_list: {  }
           is_grouped: true
           group_info:
             label: 'Published status'
@@ -531,6 +534,8 @@ display:
               seo: '0'
               administrator: '0'
             reduce: false
+            operator_limit_selection: false
+            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -574,6 +579,8 @@ display:
               seo: '0'
               administrator: '0'
             placeholder: ''
+            operator_limit_selection: false
+            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
diff --git a/modules/content_lock_timeout/tests/src/Functional/ContentLockTimeoutTest.php b/modules/content_lock_timeout/tests/src/Functional/ContentLockTimeoutTest.php
index e65ef67..2639d96 100644
--- a/modules/content_lock_timeout/tests/src/Functional/ContentLockTimeoutTest.php
+++ b/modules/content_lock_timeout/tests/src/Functional/ContentLockTimeoutTest.php
@@ -3,7 +3,7 @@
 namespace Drupal\Tests\content_lock_timeout\Functional;
 
 use Drupal\Component\FileCache\FileCacheFactory;
-use Drupal\Core\Entity\Entity;
+use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Serialization\Yaml;
 use Drupal\Tests\BrowserTestBase;
 use Drupal\Tests\taxonomy\Functional\TaxonomyTestTrait;
@@ -230,12 +230,12 @@ class ContentLockTimeoutTest extends BrowserTestBase {
   /**
    * Run the same tests for node, block and term.
    *
-   * @param \Drupal\Core\Entity\Entity $entity
+   * @param \Drupal\Core\Entity\EntityInterface $entity
    *   The entity to tests.
    *
    * @throws \Drupal\Core\Entity\EntityMalformedException
    */
-  protected function doTestForEntity(Entity $entity) {
+  protected function doTestForEntity(EntityInterface $entity) {
     // We lock article1.
     $this->drupalLogin($this->user2);
 
@@ -285,10 +285,10 @@ class ContentLockTimeoutTest extends BrowserTestBase {
    * As logout is removing locks, it is only possible to set a lock from another
    * user with the lock service.
    *
-   * @param \Drupal\Core\Entity\Entity $entity
+   * @param \Drupal\Core\Entity\EntityInterface $entity
    *   The entity which should be locked.
    */
-  protected function lockContentByUser1(Entity $entity) {
+  protected function lockContentByUser1(EntityInterface $entity) {
     $this->lockService->releaseAllUserLocks($this->user2->id());
     $this->lockService->locking($entity->id(), $entity->language()->getId(), 'edit', $this->user1->id(), $entity->getEntityTypeId());
     $lock = $this->lockService->fetchLock($entity->id(), $entity->language()->getId(), 'edit', $entity->getEntityTypeId());
@@ -299,10 +299,10 @@ class ContentLockTimeoutTest extends BrowserTestBase {
   /**
    * Assert if no lock is present for content.
    *
-   * @param \Drupal\Core\Entity\Entity $entity
+   * @param \Drupal\Core\Entity\EntityInterface $entity
    *   The entity which should not have a lock.
    */
-  protected function assertNoLockOnContent(Entity $entity) {
+  protected function assertNoLockOnContent(EntityInterface $entity) {
     $lock = $this->lockService->fetchLock($entity->id(), $entity->language()->getId(), 'edit', $entity->getEntityTypeId());
     $this->assertFalse($lock, 'No lock present.');
   }