Couple of speed tweaks.