Tweaks for the setup script