A few tweaks to the launcher