diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php
index 02e4860864..62d0a5e0d5 100644
--- a/actions/apitimelineuser.php
+++ b/actions/apitimelineuser.php
@@ -447,7 +447,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
                 } else {
                     $group = User_group::staticGet('uri', $uri);
                     if (!empty($group)) {
-                        $options['groups'][] = $uri;
+                        $options['groups'][] = $group->id;
                     } else {
                         // @fixme: hook for discovery here
                         common_log(LOG_WARNING, sprintf('AtomPub post with unknown attention URI %s', $uri));
diff --git a/classes/Profile.php b/classes/Profile.php
index a6275cf451..5ace57004c 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -778,7 +778,7 @@ class Profile extends Managed_DataObject
 
         $faves = new Fave();
         $faves->user_id = $this->id;
-        $cnt = (int) $faves->count('distinct notice_id');
+        $cnt = (int) $faves->count('notice_id');
 
         if (!empty($c)) {
             $c->set(Cache::key('profile:fave_count:'.$this->id), $cnt);
diff --git a/lib/apiaction.php b/lib/apiaction.php
index 7b2f70c07c..72dd3caf25 100644
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
@@ -376,6 +376,7 @@ class ApiAction extends Action
         // StatusNet-specific
 
         $twitter_status['statusnet_html'] = $notice->rendered;
+        $twitter_status['statusnet_conversation_id'] = $notice->conversation;
 
         return $twitter_status;
     }
diff --git a/plugins/OpenID/User_openid.php b/plugins/OpenID/User_openid.php
index a9c96fa4bd..03a0b0ccd9 100644
--- a/plugins/OpenID/User_openid.php
+++ b/plugins/OpenID/User_openid.php
@@ -63,7 +63,7 @@ class User_openid extends Memcached_DataObject
         return array(false, false, false);
     }
 
-    Static function hasOpenID($user_id)
+    static function hasOpenID($user_id)
     {
         $oid = new User_openid();