diff --git a/src/dialogs.py b/src/dialogs.py
index d37853183..6354e4f0a 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -834,7 +834,7 @@ _('You can not join a group chat unless you are connected.')).get_response()
 	def on_recently_combobox_changed(self, widget):
 		model = widget.get_model()
 		iter = widget.get_active_iter()
-		gid = model.get_value(iter, 0)
+		gid = model[iter][0]
 		self.xml.get_widget('room_entry').set_text(gid.split('@')[0])
 		self.xml.get_widget('server_entry').set_text(gid.split('@')[1])
 
diff --git a/src/roster_window.py b/src/roster_window.py
index 3045ef9ec..8dcf92e50 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -261,6 +261,7 @@ class RosterWindow:
 			#FIXME: add avatar
 
 	def join_gc_room(self, account, room_jid, nick, password):
+		#FIXME: maybe remove this and just let the server do the message?
 		if room_jid in self.plugin.windows[account]['gc']:
 			dialogs.ErrorDialog(_('You are already in room %s') %room_jid
 				).get_response()