diff --git a/src/chat_control.py b/src/chat_control.py
index 43be06a9092563d8575f70d6c630585ccb37c5ea..3b38848969c0afca046c03fb08eb79a4dd80e209 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -405,11 +405,11 @@ class ChatControlBase(MessageControl):
 				widget.disconnect(id_)
 				del self.handlers[id_]
 				break
-		if found:
 
 	def connect_style_event(self, widget, set_fg = False, set_bg = False):
 		self.disconnect_style_event(widget)
-		id_ = widget.connect('style-set', self._on_style_set_event, set_fg, set_bg)
+		id_ = widget.connect('style-set', self._on_style_set_event, set_fg,
+			set_bg)
 		self.handlers[id_] = widget
 
 	def _on_style_set_event(self, widget, style, *opts):
diff --git a/src/tooltips.py b/src/tooltips.py
index d5f8d113e13c129637c9a9927a69517c42ed0727..6d4d27593cb0ec1c54a38fce8e6196f866ae27e2 100644
--- a/src/tooltips.py
+++ b/src/tooltips.py
@@ -342,7 +342,7 @@ class GCTooltip(BaseTooltip):
 		file_ = helpers.get_avatar_path(os.path.join(gajim.AVATAR_PATH, puny_room,
 			puny_name))
 		if file_:
-			_self.avatar_image.set_from_file(file_)
+			self.avatar_image.set_from_file(file_)
 			pix = self.avatar_image.get_pixbuf()
 			pix = gtkgui_helpers.get_scaled_pixbuf(pix, 'tooltip')
 			self.avatar_image.set_from_pixbuf(pix)