Minor Tweaks for Launch