Fixes to the Launcher