Adding fixes to launcher