diff --git a/classes/User_group.php b/classes/User_group.php
index 4289c51386..50f4b7ddc7 100644
--- a/classes/User_group.php
+++ b/classes/User_group.php
@@ -68,7 +68,7 @@ class User_group extends Managed_DataObject
         );
     }
 
-    function defaultLogo($size)
+    public static function defaultLogo($size)
     {
         static $sizenames = array(AVATAR_PROFILE_SIZE => 'profile',
                                   AVATAR_STREAM_SIZE => 'stream',
diff --git a/lib/threadednoticelist.php b/lib/threadednoticelist.php
index 5c45b5a831..c3382897c7 100644
--- a/lib/threadednoticelist.php
+++ b/lib/threadednoticelist.php
@@ -80,7 +80,8 @@ class ThreadedNoticeList extends NoticeList
 		$total = count($notices);
 		$notices = array_slice($notices, 0, NOTICES_PER_PAGE);
 		
-    	self::prefill(self::_allNotices($notices));
+        $allnotices = self::_allNotices($notices);
+    	self::prefill($allnotices);
     	
         $conversations = array();
         
diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php
index a5666e5aa6..8b337a5f27 100644
--- a/plugins/Xmpp/XmppPlugin.php
+++ b/plugins/Xmpp/XmppPlugin.php
@@ -318,7 +318,7 @@ class XmppPlugin extends ImPlugin
         $this->queuedConnection()->message($screenname, $body, 'chat');
     }
 
-    function sendNotice($screenname, $notice)
+    function sendNotice($screenname, Notice $notice)
     {
         $msg   = $this->formatNotice($notice);
         $entry = $this->format_entry($notice);