diff --git a/include/ajax.tickets.php b/include/ajax.tickets.php
index 2a644269fb759f74b6e3a0077fee9a3459882234..403b92244d1d3cf89397b96f3c43417e871b6952 100644
--- a/include/ajax.tickets.php
+++ b/include/ajax.tickets.php
@@ -187,8 +187,6 @@ class TicketsAjaxAPI extends AjaxController {
             return 1;
         }
         return $lock->release() ? 1 : 0;
-
-        return Lock::removeStaffLocks($thisstaff->getId(), $ticket) ? 1 : 0;
     }
 
     function previewTicket ($tid) {
diff --git a/include/class.avatar.php b/include/class.avatar.php
index c328855a1abd3a6bb2b914bbaa587dec471507f0..93024d02cb5f7b624a6e00284141b5a9ba2aac45 100644
--- a/include/class.avatar.php
+++ b/include/class.avatar.php
@@ -110,9 +110,6 @@ extends Avatar {
     }
 
     function getUrl($size) {
-        if (false && ($file = $this->user->getAvatarFile()))
-            return $file->getDownloadUrl();
-
         $code = $this->code;
         if (!$code && method_exists($this->user, 'getExtraAttr'))
             $code = $this->user->getExtraAttr('avatar');
diff --git a/include/class.list.php b/include/class.list.php
index c512e796d705e6d204e26dcdc58e57c67a22aef6..93f666c50a0bcf2b341147ef0d5a54593120ee88 100644
--- a/include/class.list.php
+++ b/include/class.list.php
@@ -324,6 +324,7 @@ class DynamicList extends VerySimpleModel implements CustomList {
 
     // Fields shown on the list items page
     function getSummaryFields() {
+        $prop_fields = array();
         foreach ($this->getConfigurationForm()->getFields() as $f) {
             if (in_array($f->get('type'), array('text', 'datetime', 'phone')))
                 $prop_fields[] = $f;
@@ -1121,6 +1122,7 @@ class TicketStatusList extends CustomListHandler {
     function getSummaryFields() {
         // Like the main one, except the description and state fields are
         // welcome on the screen
+        $prop_fields = array();
         foreach ($this->getConfigurationForm()->getFields() as $f) {
             if (in_array($f->get('type'), array('state', 'text', 'datetime', 'phone')))
                 $prop_fields[] = $f;
diff --git a/setup/test/tests/stubs.php b/setup/test/tests/stubs.php
index b40053bd26531d1fd4a83a17253e35aef2adb249..67539baa83b21399a975b058b55c27eeec1992b8 100644
--- a/setup/test/tests/stubs.php
+++ b/setup/test/tests/stubs.php
@@ -164,6 +164,10 @@ class NumberFormatter {
     function getSymbol() {}
 }
 
+class Collator {
+    function setStrength() {}
+}
+
 class Aws_Route53_Client {
     function changeResourceRecordSets() {}
 }