Performance issue tweaks