perf metric: Fix some memory leaks - part 2