diff --git a/libcaja-private/caja-icon-info.c b/libcaja-private/caja-icon-info.c
index 02ce1d8a9..a681c0166 100644
--- a/libcaja-private/caja-icon-info.c
+++ b/libcaja-private/caja-icon-info.c
@@ -347,7 +347,7 @@ caja_icon_info_lookup (GIcon *icon,
 
         lookup_key.icon = icon;
         lookup_key.scale = scale;
-        lookup_key.size = size * scale;
+        lookup_key.size = size;
 
         icon_info = g_hash_table_lookup (loadable_icon_cache, &lookup_key);
         if (icon_info)
diff --git a/src/caja-emblem-sidebar.c b/src/caja-emblem-sidebar.c
index f6fc6860e..9c46837e6 100644
--- a/src/caja-emblem-sidebar.c
+++ b/src/caja-emblem-sidebar.c
@@ -360,6 +360,10 @@ create_popup_menu (CajaEmblemSidebar *emblem_sidebar)
 
     popup = gtk_menu_new ();
 
+    gtk_menu_attach_to_widget (GTK_MENU (popup),
+                               GTK_WIDGET (emblem_sidebar),
+                               NULL);
+
     gtk_menu_set_reserve_toggle_size (GTK_MENU (popup), FALSE);
 
     /* add the "rename" menu item */
diff --git a/src/caja-notes-viewer.c b/src/caja-notes-viewer.c
index 10f03e0b0..d65916644 100644
--- a/src/caja-notes-viewer.c
+++ b/src/caja-notes-viewer.c
@@ -338,6 +338,8 @@ caja_notes_viewer_init (CajaNotesViewer *sidebar)
     /* create the text container */
     details->text_buffer = gtk_text_buffer_new (NULL);
     details->note_text_field = gtk_text_view_new_with_buffer (details->text_buffer);
+    // gtk_text_view_new_with_buffer will add reference to text buffer
+    g_object_unref (details->text_buffer);
 
     gtk_text_view_set_editable (GTK_TEXT_VIEW (details->note_text_field), TRUE);
     gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (details->note_text_field),
diff --git a/src/caja-window-menus.c b/src/caja-window-menus.c
index 3b65fa79a..babbe108e 100644
--- a/src/caja-window-menus.c
+++ b/src/caja-window-menus.c
@@ -1165,7 +1165,11 @@ add_extension_menu_items (CajaWindow *window,
 
             caja_menu_item_list_free (children);
             g_free (subdir);
+
+            g_object_unref (menu);
         }
+
+        g_object_unref (action);
     }
 }