Pre-launch tweaks and fixes