--- a/mcabber/mcabber/commands.c	Sat Mar 26 13:37:33 2011 +0100
+++ b/mcabber/mcabber/commands.c	Sat Mar 26 13:56:41 2011 +0100
@@ -1988,7 +1988,7 @@
   if (on_srv)
     xmpp_updatebuddy(bjid, name, *groupname ? groupname : NULL);
   else
-    buddy_setname(bud, (char*)name);
+    buddy_setgroup(bud, (char *)groupname);
 }
 
 static void do_rename(char *arg)

--- a/mcabber/mcabber/roster.c	Sat Mar 26 13:37:33 2011 +0100
+++ b/mcabber/mcabber/roster.c	Sat Mar 26 13:56:41 2011 +0100
@@ -1609,10 +1609,12 @@
 
   sl_roster_usrelt = roster_elt->list;
   while (sl_roster_usrelt) {  // user list loop
+    GSList *next_sl_usrelt;
     roster_usrelt = (roster*) sl_roster_usrelt->data;
 
+    next_sl_usrelt = g_slist_next(sl_roster_usrelt);
     pfunc(roster_usrelt, param);
-    sl_roster_usrelt = g_slist_next(sl_roster_usrelt);
+    sl_roster_usrelt = next_sl_usrelt;
   }
 }