Launcher bug fixes