diff --git a/deluge/ui/gtk3/common.py b/deluge/ui/gtk3/common.py
index d75193d29..d27d7acd9 100644
--- a/deluge/ui/gtk3/common.py
+++ b/deluge/ui/gtk3/common.py
@@ -35,7 +35,7 @@ log = logging.getLogger(__name__)
 
 
 def create_blank_pixbuf(size=16):
-    pix = Pixbuf(Colorspace.RGB, True, 8, size, size)
+    pix = Pixbuf.new(Colorspace.RGB, True, 8, size, size)
     pix.fill(0x0)
     return pix
 
diff --git a/deluge/ui/gtk3/listview.py b/deluge/ui/gtk3/listview.py
index b6d50fccd..78570f12d 100644
--- a/deluge/ui/gtk3/listview.py
+++ b/deluge/ui/gtk3/listview.py
@@ -217,11 +217,8 @@ class ListView(object):
             self.last_sort_order = {}
 
             def record_position(model, path, _iter, data):
-                # FIXME: TypeError: 'TreePath' object does not support indexing
-                # Verify (old code: ` = path[0]`)
-                self.last_sort_order[model[_iter][self.unique_column_id]] = int(
-                    str(model.get_path(iter))
-                )
+                unique_id = model[_iter][self.unique_column_id]
+                self.last_sort_order[unique_id] = int(str(path))
 
             model.foreach(record_position, None)
 
@@ -576,7 +573,6 @@ class ListView(object):
         column.set_min_width(20)
         column.set_reorderable(True)
         column.set_visible(not hidden)
-        # FIXME: Check for errors with button press, related new signal
         column.connect('button-press-event', self.on_treeview_header_right_clicked)
 
         if tooltip:
diff --git a/deluge/ui/gtk3/path_combo_chooser.py b/deluge/ui/gtk3/path_combo_chooser.py
index f6f7b34ec..91e8c2933 100755
--- a/deluge/ui/gtk3/path_combo_chooser.py
+++ b/deluge/ui/gtk3/path_combo_chooser.py
@@ -1164,7 +1164,6 @@ class PathChooserComboBox(Gtk.Box, StoredValuesPopup, GObject.GObject):
         self.default_text = None
         self.button_properties = self.builder.get_object('button_properties')
 
-        # FIXME: These are commented out but should be fixed.
         self.combobox_window = self.builder.get_object('combobox_window')
         self.combo_hbox = self.builder.get_object('entry_combobox_hbox')
         # Change the parent of the hbox from the glade Window to this hbox.
diff --git a/deluge/ui/gtk3/systemtray.py b/deluge/ui/gtk3/systemtray.py
index 4709c3502..81a7c2ffb 100644
--- a/deluge/ui/gtk3/systemtray.py
+++ b/deluge/ui/gtk3/systemtray.py
@@ -352,8 +352,9 @@ class SystemTray(component.Component):
         if windows_check() or osx_check():
             popup_function = None
             button = 0
-        # FIXME why was status_icon removed??
-        self.tray_menu.popup(None, None, None, popup_function, button, activate_time)
+        self.tray_menu.popup(
+            None, None, None, popup_function, status_icon, button, activate_time
+        )
 
     def on_menuitem_show_deluge_activate(self, menuitem):
         log.debug('on_menuitem_show_deluge_activate')
diff --git a/deluge/ui/gtk3/torrentview.py b/deluge/ui/gtk3/torrentview.py
index 97f406cc0..fad9526ba 100644
--- a/deluge/ui/gtk3/torrentview.py
+++ b/deluge/ui/gtk3/torrentview.py
@@ -662,7 +662,6 @@ class TorrentView(ListView, component.Component):
                 to_update = []
                 for i, status_field in fields_to_update:
                     row_value = status[torrent_id][status_field]
-                    # FIXME: Seeing UnicodeWarning??
                     if row[i] != row_value:
                         to_update.append(i)
                         to_update.append(row_value)