Updates to setup script