diff --git a/liblogdiag/ld-library-toolbar.c b/liblogdiag/ld-library-toolbar.c
index d1ceb9c..b18980f 100644
--- a/liblogdiag/ld-library-toolbar.c
+++ b/liblogdiag/ld-library-toolbar.c
@@ -443,6 +443,9 @@ load_category_cb (gpointer data, gpointer user_data)
 	g_object_set (button, "can-focus", FALSE, NULL);
 
 	/* Assign the category to the toggle button. */
+	/* TODO: Move this to the data parameter for the signal handler.
+	 *       Use g_signal_connect_data() to set up destroy notification.
+	 */
 	g_object_ref (cat);
 	g_object_set_data_full (G_OBJECT (button),
 		"category", cat, (GDestroyNotify) g_object_unref);
diff --git a/src/ld-window-main.c b/src/ld-window-main.c
index f7d9f8d..4f3e603 100644
--- a/src/ld-window-main.c
+++ b/src/ld-window-main.c
@@ -510,6 +510,7 @@ diagram_save (LdWindowMain *self)
 		return;
 	}
 
+	/* FIXME: If this fails, we still retain the filename. */
 	error = NULL;
 	ld_diagram_save_to_file (self->priv->diagram,
 		self->priv->filename, &error);