Minor changes to launcher