Changes to setup script