Minor tweaks for launch