Minor changes to launcher.