Fix perf-counters walking. Fix custom ds.