diff --git a/c/mapping/mapper_top.c b/c/mapping/mapper_top.c
index 66f1bf796..e33e3126d 100644
--- a/c/mapping/mapper_top.c
+++ b/c/mapping/mapper_top.c
@@ -131,6 +131,7 @@ static void mapper_top_free(void* pvstate) {
 			top_keeper_t* ptop_keeper_for_group = pb->pvvalue;
 			top_keeper_free(ptop_keeper_for_group);
 		}
+		lhmsv_free(pgroup);
 	}
 
 	lhmslv_free(pstate->groups);
@@ -162,6 +163,7 @@ static void mapper_top_ingest(lrec_t* pinrec, mapper_top_state_t* pstate) {
 		return;
 	}
 	if (pgroup_by_field_values->length != pstate->pgroup_by_field_names->length) {
+		slls_free(pvalue_field_values);
 		slls_free(pgroup_by_field_values);
 		lrec_free(pinrec);
 		return;
diff --git a/c/todo.txt b/c/todo.txt
index f3b0e077e..278e4c1ad 100644
--- a/c/todo.txt
+++ b/c/todo.txt
@@ -22,6 +22,7 @@ TOP OF LIST
 * mem-mgmt scrutinize: valgrind w/ leak check @ regtest/run
   - track-origins?
   - xxxes
+  - more rid of "double" in fcn names
 * profile new streqn vs. strncmp ...
 * mixed-format joins ...
 * stats1 handle empty-key nulls? stats2? step? top? etc ...