Optimization tweaks