Prelaunch clean-up and tweaks