Address perf issues