Launcher fixes.