More tweaks to the Installer