More startup speed tweaks