Some optimization tweaks