diff --git a/config/vufind/searchspecs.yaml b/config/vufind/searchspecs.yaml
index 532a8e3d645d0893e178c1706539027f0648fc5c..e945c79ad982bd74ef8ab3ba1fb11e78f923a8d4 100644
--- a/config/vufind/searchspecs.yaml
+++ b/config/vufind/searchspecs.yaml
@@ -158,6 +158,7 @@ Author:
     - author2
     - author2_fuller
     - author_additional
+    - author_corporate
     - author_variant
     - author2_variant
   QueryFields:
@@ -181,6 +182,10 @@ Author:
       - [onephrase, 100]
       - [and, 50]
       - [or, ~]
+    author_corporate:
+      - [onephrase, 100]
+      - [and, 50]
+      - [or, ~]
     author_variant:
       - [onephrase, 100]
       - [and, 50]
diff --git a/module/VuFind/src/VuFind/Config/Upgrade.php b/module/VuFind/src/VuFind/Config/Upgrade.php
index 1a4e4397e842e2d515948ff1a7e0600ceb5daa0e..d5a65bb26cf2f0ab56209d099ec40a33d9bc6242 100644
--- a/module/VuFind/src/VuFind/Config/Upgrade.php
+++ b/module/VuFind/src/VuFind/Config/Upgrade.php
@@ -1139,7 +1139,6 @@ class Upgrade
     protected function upgradePrimoServerSettings()
     {
         $config = & $this->newConfigs['Primo.ini'];
-        $permissions = & $this->newConfigs['permissions.ini'];
         // Convert apiId to url
         if (isset($config['General']['apiId'])) {
             $url = 'http://' . $config['General']['apiId']
diff --git a/module/VuFind/src/VuFind/ILS/Driver/XCNCIP2.php b/module/VuFind/src/VuFind/ILS/Driver/XCNCIP2.php
index ad82f9983a97041b4c8408429af86b79953501ab..787e4382b31fcf1829148bc2fea01272bf2455ae 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/XCNCIP2.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/XCNCIP2.php
@@ -1334,7 +1334,7 @@ class XCNCIP2 extends AbstractBase implements \VuFindHttp\HttpServiceAwareInterf
         $response = [];
 
         foreach ($details as $cancelDetails) {
-            list($itemAgencyId, $requestId, $bibId) = explode("|", $cancelDetails);
+            list($itemAgencyId, $requestId) = explode("|", $cancelDetails);
             $request = $this->getCancelRequest(
                 $username, $password, $patronAgency,
                 $itemAgencyId, $requestId, "Hold"
@@ -1406,7 +1406,7 @@ class XCNCIP2 extends AbstractBase implements \VuFindHttp\HttpServiceAwareInterf
         $response = [];
 
         foreach ($details as $cancelDetails) {
-            list($itemAgencyId, $requestId, $bibId) = explode("|", $cancelDetails);
+            list($itemAgencyId, $requestId) = explode("|", $cancelDetails);
             $request = $this->getCancelRequest(
                 $username,
                 $password,
@@ -1474,7 +1474,7 @@ class XCNCIP2 extends AbstractBase implements \VuFindHttp\HttpServiceAwareInterf
     {
         $details = [];
         foreach ($renewDetails['details'] as $agencyId_renewId) {
-            list($agencyId, $renewId, $bibId) = explode("|", $agencyId_renewId);
+            list($agencyId, $renewId) = explode("|", $agencyId_renewId);
             $request = $this->getRenewRequest(
                 $renewDetails['patron']['cat_username'],
                 $renewDetails['patron']['cat_password'], $renewId,
diff --git a/module/VuFind/src/VuFind/Search/Base/Params.php b/module/VuFind/src/VuFind/Search/Base/Params.php
index f1df82a0cf77310e98612a0cf9de6a2c36d47a9b..1fb493b4761f89f9d10968b4a8aca00ac55ec628 100644
--- a/module/VuFind/src/VuFind/Search/Base/Params.php
+++ b/module/VuFind/src/VuFind/Search/Base/Params.php
@@ -1094,7 +1094,7 @@ class Params implements ServiceLocatorAwareInterface
         // Build up an array of checkbox facets with status booleans and
         // toggle URLs.
         $result = [];
-        foreach ($this->checkboxFacets as $field => $facets) {
+        foreach ($this->checkboxFacets as $facets) {
             foreach ($facets as $facet) {
                 $facet['selected'] = $this->hasFilter($facet['filter']);
                 // Is this checkbox always visible, even if non-selected on the
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/SearchTabs.php b/module/VuFind/src/VuFind/View/Helper/Root/SearchTabs.php
index b7d685b82d38627cd42307742e704de01ee93574..fc68369757d7ab28bc21a94b4a135726b8b9496c 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/SearchTabs.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/SearchTabs.php
@@ -313,7 +313,6 @@ class SearchTabs extends \Zend\View\Helper\AbstractHelper
         // If an advanced search is available, link there; otherwise, just go
         // to the search home:
         $results = $this->results->get($class);
-        $urlParams = $results->getUrlQuery()->getParams(false);
         $url = $this->url->__invoke($results->getOptions()->getSearchHomeAction())
             . $this->buildUrlHiddenFilters($results, $filters);
         return [