Fix some perf issues