Some speed tweaks.