diff --git a/module/VuFind/src/VuFind/ILS/Driver/Unicorn.php b/module/VuFind/src/VuFind/ILS/Driver/Unicorn.php
index 99c1e754ffe3f4929c755d2414df0ed473c959a3..03300a24667c8ea400d7bf7a18c390d77c37817b 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Unicorn.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Unicorn.php
@@ -562,8 +562,7 @@ class Unicorn extends AbstractBase implements \VuFindHttp\HttpServiceAwareInterf
         );
         $response = $this->querySirsi($params);
 
-        list($user_key, $alt_id, $barcode, $name, $library, $profile,
-        $cat1, $cat2, $cat3, $cat4, $cat5, $expiry, $holds, 
+        list($user_key, , , , $library, $profile, , , , , , , ,
         $email, $address1, $zip, $phone, $address2) = explode('|', $response);
 
         return array(
@@ -663,10 +662,8 @@ class Unicorn extends AbstractBase implements \VuFindHttp\HttpServiceAwareInterf
         $lines = explode("\n", $response);
         $items = array();
         foreach ($lines as $item) {
-            list($catkey, $holdkey, $available, $recall_status, $date_expires,
-            $reserve, $date_created, $priority, $type, $pickup_library,
-            $suspend_begin, $suspend_end, $date_recalled, $special_request,
-            $date_available, $date_available_expires, $barcode)
+            list($catkey, $holdkey, $available, , $date_expires, , $date_created, ,
+            $type, $pickup_library, , , , , , , $barcode)
                 = explode('|', $item);
 
             $date_created = $this->parseDateTime($date_created);
@@ -741,7 +738,7 @@ class Unicorn extends AbstractBase implements \VuFindHttp\HttpServiceAwareInterf
             foreach ($lines as $line) {
                 // error lines start with '**'
                 if (strpos(trim($line), '**') === 0) {
-                    list($message, $holdKey) = explode(':', $line);
+                    list(, $holdKey) = explode(':', $line);
                     $failures[] = trim($holdKey, '()');
                 }
             }
diff --git a/module/VuFind/src/VuFind/View/Helper/Root/SafeMoneyFormat.php b/module/VuFind/src/VuFind/View/Helper/Root/SafeMoneyFormat.php
index 109da995ae8c59080a093f223635460980d0ad25..bce3e0eff2a5eda671dd487f63e2617b011192a0 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/SafeMoneyFormat.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/SafeMoneyFormat.php
@@ -68,30 +68,30 @@ class SafeMoneyFormat extends AbstractHelper
         // '' or NULL gets the locale values from environment variables
         setlocale(LC_ALL, '');
         $locale = localeconv();
-        extract($locale);
 
         // Windows doesn't support UTF-8 encoding in setlocale, so we'll have to
         // convert the currency symbol manually:
-        $currency_symbol = self::safeMoneyFormatMakeUTF8($currency_symbol);
+        $currency_symbol = self::safeMoneyFormatMakeUTF8($locale['currency_symbol']);
 
         // How is the amount signed?
         // Positive
         if ($number > 0) {
-            $sign         = $positive_sign;
-            $sign_posn    = $p_sign_posn;
-            $sep_by_space = $p_sep_by_space;
-            $cs_precedes  = $p_cs_precedes;
+            $sign         = $locale['positive_sign'];
+            $sign_posn    = $locale['p_sign_posn'];
+            $sep_by_space = $locale['p_sep_by_space'];
+            $cs_precedes  = $locale['p_cs_precedes'];
         } else {
             // Negative
-            $sign         = $negative_sign;
-            $sign_posn    = $n_sign_posn;
-            $sep_by_space = $n_sep_by_space;
-            $cs_precedes  = $n_cs_precedes;
+            $sign         = $locale['negative_sign'];
+            $sign_posn    = $locale['n_sign_posn'];
+            $sep_by_space = $locale['n_sep_by_space'];
+            $cs_precedes  = $locale['n_cs_precedes'];
         }
 
         // Format the absolute value of the number
         $m = number_format(
-            abs($number), $frac_digits, $mon_decimal_point, $mon_thousands_sep
+            abs($number), $locale['frac_digits'], $locale['mon_decimal_point'],
+            $locale['mon_thousands_sep']
         );
 
         // Spaces between the number and symbol?
diff --git a/module/VuFindSearch/src/VuFindSearch/Service.php b/module/VuFindSearch/src/VuFindSearch/Service.php
index 1223ab673430635a1bd991990328cd61a882acb9..8108e4186864c0120ee0b8eca9aa7ff59904d10e 100644
--- a/module/VuFindSearch/src/VuFindSearch/Service.php
+++ b/module/VuFindSearch/src/VuFindSearch/Service.php
@@ -153,7 +153,7 @@ class Service
     {
         $params  = $params ?: new ParamBag();
         $context = __FUNCTION__;
-        $args = compact('backend', 'id', 'params', 'context');
+        $args = compact('backend', 'ids', 'params', 'context');
         $backend = $this->resolve($backend, $args);
         $args['backend_instance'] = $backend;