Merge "Minor fixes to Launcher"