diff --git a/src/Plugin/facets/facet_source/SearchApiBaseFacetSource.php b/src/Plugin/facets/facet_source/SearchApiBaseFacetSource.php
index f5930ff..c42fddc 100644
--- a/src/Plugin/facets/facet_source/SearchApiBaseFacetSource.php
+++ b/src/Plugin/facets/facet_source/SearchApiBaseFacetSource.php
@@ -91,9 +91,12 @@ abstract class SearchApiBaseFacetSource extends FacetSourcePluginBase {
    */
   public function getFields() {
     $indexed_fields = [];
-    $fields = $this->index->getFields();
+    /** @var \Drupal\search_api\IndexInterface $index */
+    $index = $this->getIndex();
+
+    $fields = $index->getFields();
     // Get the Search API Server.
-    $server = $this->index->getServerInstance();
+    $server = $index->getServerInstance();
     // Get the Search API Backend.
     $backend = $server->getBackend();
     foreach ($fields as $field) {
@@ -113,12 +116,14 @@ abstract class SearchApiBaseFacetSource extends FacetSourcePluginBase {
     // Get our Facets Field Identifier, which is equal to the Search API Field
     // identifier.
     $field_id = $facet->getFieldIdentifier();
+    /** @var \Drupal\search_api\IndexInterface $index */
+    $index = $this->getIndex();
     // Get the Search API Server.
-    $server = $this->index->getServerInstance();
+    $server = $index->getServerInstance();
     // Get the Search API Backend.
     $backend = $server->getBackend();
 
-    $fields = $this->index->getFields();
+    $fields = $index->getFields();
     foreach ($fields as $field) {
       if ($field->getFieldIdentifier() == $field_id) {
         return $this->getQueryTypesForDataType($backend, $field->getType());
diff --git a/src/Plugin/facets/facet_source/SearchApiViews.php b/src/Plugin/facets/facet_source/SearchApiViews.php
index ba77bc7..871343f 100644
--- a/src/Plugin/facets/facet_source/SearchApiViews.php
+++ b/src/Plugin/facets/facet_source/SearchApiViews.php
@@ -62,7 +62,7 @@ class SearchApiViews extends SearchApiBaseFacetSource implements SearchApiFacetS
 
     /** @var \Drupal\search_api\Display\DisplayInterface $display */
     $display = $displayPluginManager->createInstance($display_id);
-    return $display->getUrl();
+    return $display->getUrl()->toString();
   }
 
   /**