Some updates to setup script