Last minute performance tweaks