Some changes to setup script.