Pre-performance tweaks