Fixes to the launcher again.