Fixed client-side perf issues