Merge "small fixes to Launcher"