Launcher fixes