Tweaks to the setup script.