Optimization tweaks.