Minor changes to setup script