Some moar speed tweaks