Tweaks and fixes for launch.