Mild changes to setup script