Preformance tweaks