More launch tweaks