Performance-related tweaks