Minor refinements to setup script