Minor mods to setup script.