2 files changed, 4 insertions, 0 deletions
diff --git a/src/analysis/disass/area.c b/src/analysis/disass/area.c
index 030d58e..06893ff 100644
--- a/src/analysis/disass/area.c
+++ b/src/analysis/disass/area.c
@@ -1578,6 +1578,7 @@ mem_area *collect_memory_areas(wgroup_id_t gid, GtkStatusStack *status, GLoadedB
 
         collectors[i] = g_area_collector_new_intro(id, binary, first, last, closing);
 
+        g_object_ref(G_OBJECT(collectors[i]));
         g_work_queue_schedule_work(queue, G_DELAYED_WORK(collectors[i]), gid);
 
     }
@@ -1944,6 +1945,7 @@ GArchInstruction **collect_disassembled_instructions(wgroup_id_t gid, GtkStatusS
 
         collectors[i] = g_area_collector_new_outro(id, list, begin, end);
 
+        g_object_ref(G_OBJECT(collectors[i]));
         g_work_queue_schedule_work(queue, G_DELAYED_WORK(collectors[i]), gid);
 
     }
diff --git a/src/analysis/disass/output.c b/src/analysis/disass/output.c
index 40cd12b..063280c 100644
--- a/src/analysis/disass/output.c
+++ b/src/analysis/disass/output.c
@@ -344,6 +344,8 @@ void print_disassembled_instructions(GBufferCache *cache, GCodingLanguage *lang,
 
     assert(comment_index == comment_count);
 
+    _g_preload_info_drain_comments(info);
+
     g_preload_info_unlock_comments(info);
 
     gtk_status_stack_remove_activity(status, id);