More speed tweaks